diff --git a/.github/workflows/brakeman-scan-core.yml b/.github/workflows/brakeman-scan-core.yml
index 998d0bedbdf..8ee3db571bd 100644
--- a/.github/workflows/brakeman-scan-core.yml
+++ b/.github/workflows/brakeman-scan-core.yml
@@ -25,10 +25,12 @@ jobs:
       RUBY_GC_HEAP_INIT_SLOTS: 100000
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
 
       - name: Setup Brakeman
         run: |
@@ -44,6 +46,6 @@ jobs:
             --output output.sarif.json
 
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@v4
+        uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4
         with:
           sarif_file: output.sarif.json
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 14dd8d62884..8889a071a85 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/github-action@v2.6.1
+        uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
         env:
           # https://github.com/contributor-assistant/github-action?tab=readme-ov-file#environmental-variables
           # Built-in GitHub token to make the API calls for interacting with GitHub. Does not need to be specified the secrets store.
diff --git a/.github/workflows/codeql-scan-core.yml b/.github/workflows/codeql-scan-core.yml
index 69b60912baa..5a3b4699184 100644
--- a/.github/workflows/codeql-scan-core.yml
+++ b/.github/workflows/codeql-scan-core.yml
@@ -31,10 +31,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4
         with:
           config-file: ./.github/codeql/config.yml
           languages: ${{ matrix.language }}
@@ -42,6 +44,6 @@ jobs:
           queries: security-extended,security-and-quality
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/create-merge-from-previous-release-branch-pr.yml b/.github/workflows/create-merge-from-previous-release-branch-pr.yml
index 688ce09e215..0862bea6c7f 100644
--- a/.github/workflows/create-merge-from-previous-release-branch-pr.yml
+++ b/.github/workflows/create-merge-from-previous-release-branch-pr.yml
@@ -59,7 +59,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ env.RELEASE_BRANCH }}
 
diff --git a/.github/workflows/create-merge-release-into-dev-pr.yml b/.github/workflows/create-merge-release-into-dev-pr.yml
index 853e71493be..57e27fb2ac1 100644
--- a/.github/workflows/create-merge-release-into-dev-pr.yml
+++ b/.github/workflows/create-merge-release-into-dev-pr.yml
@@ -44,7 +44,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ env.BASE_BRANCH }}
 
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index 03f3c5ae822..165df9c1f9d 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -42,11 +42,11 @@ jobs:
           - dev
           - "${{ needs.setup.outputs.latest_release_branch }}"
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ matrix.branch }}
           fetch-depth: 1
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
         with:
           bundler-cache: true
       - name: "Set crowdin branch name"
@@ -66,7 +66,7 @@ jobs:
             bundle exec script/i18n/generate_seeders_i18n_source_file
           fi
       - name: "Crowdin: upload sources and download translations"
-        uses: crowdin/github-action@v2
+        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2
         with:
           # Upload current source files
           upload_sources: true
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 0c52141f129..1fe39a33836 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -14,11 +14,15 @@ jobs:
     if: github.repository_owner == 'opf'
     runs-on: [ubuntu-latest]
     timeout-minutes: 10
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
-      - uses: ruby/setup-ruby@v1
+          persist-credentials: false
+      - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
         with:
           ruby-version: .ruby-version
           bundler-cache: true
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index e0eddeffe3e..0d3ed9ba3a2 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -34,9 +34,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4.9.0
+        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5
         # Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
         with:
           comment-summary-in-pr: on-failure
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index dc7c7bf8eef..8ff82e2ac7f 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -10,18 +10,23 @@ on:
         description: "The tag to release. Note that this happens by default on the tag push. Only run this action when something went wrong!"
         required: false
 
+permissions: {}
+
 jobs:
   compute-inputs:
     if: github.repository == 'opf/openproject'
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     outputs:
       tag: ${{ steps.compute.outputs.tag }}
       branch: ${{ steps.compute.outputs.branch }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ github.ref }}
+          persist-credentials: false
       - name: Compute tags and branch
         id: compute
         env:
@@ -47,6 +52,8 @@ jobs:
 
   build:
     needs: [compute-inputs]
+    permissions:
+      contents: read
     uses: ./.github/workflows/docker.yml
     with:
       branch: ${{ needs.compute-inputs.outputs.branch }}
diff --git a/.github/workflows/docker-scheduled.yml b/.github/workflows/docker-scheduled.yml
index ef7d7ac25d8..fa87a58375b 100644
--- a/.github/workflows/docker-scheduled.yml
+++ b/.github/workflows/docker-scheduled.yml
@@ -6,9 +6,13 @@ on:
     - cron: "20 2 * * *" # Daily at 02:20
   workflow_dispatch: # Allow manual trigger
 
+permissions: {}
+
 jobs:
   build-dev:
     if: github.repository == 'opf/openproject'
+    permissions:
+      contents: read
     uses: ./.github/workflows/docker.yml
     with:
       branch: dev
@@ -20,9 +24,12 @@ jobs:
       OPS_MAIL_SMTP_TOKEN: ${{ secrets.OPS_MAIL_SMTP_TOKEN }}
   build-release-candidate:
     if: github.repository == 'opf/openproject'
+    permissions:
+      contents: read
     # References to release/X.Y and X.Y-rc are being
     # updated from the devkit (UpdateWorkflows step) whenever a new release branch is created
-    uses: opf/openproject/.github/workflows/docker.yml@release/17.4
+    # Ignore unpinned uses as we reference the latest release branch and change it
+    uses: opf/openproject/.github/workflows/docker.yml@release/17.4 # zizmor: ignore[unpinned-uses]
     with:
       branch: release/17.4
       tag: 17.4-rc
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 899cc9f90e0..af04f3407ff 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -62,9 +62,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ inputs.branch }}
+          persist-credentials: false
       - name: Set version outputs and convert tags
         id: extract_version
         env:
@@ -85,23 +86,27 @@ jobs:
           fi
       - name: Verify outputs
         run: |
-          if [ -z "${{ steps.extract_version.outputs.version }}" ]; then
+          if [ -z "${STEPS_EXTRACT_VERSION_OUTPUTS_VERSION}" ]; then
             echo "Error: version output is empty"
             exit 1
           fi
-          if [ -z "${{ steps.extract_version.outputs.docker_tags }}" ]; then
+          if [ -z "${STEPS_EXTRACT_VERSION_OUTPUTS_DOCKER_TAGS}" ]; then
             echo "Error: docker_tags output is empty"
             exit 1
           fi
-          if [ -z "${{ steps.extract_version.outputs.registry_image }}" ]; then
+          if [ -z "${STEPS_EXTRACT_VERSION_OUTPUTS_REGISTRY_IMAGE}" ]; then
             echo "Error: registry_image output is empty"
             exit 1
           fi
-          echo "✓ version: ${{ steps.extract_version.outputs.version }}"
-          echo "✓ docker_tags: ${{ steps.extract_version.outputs.docker_tags }}"
-          echo "✓ registry_image: ${{ steps.extract_version.outputs.registry_image }}"
+          echo "✓ version: ${STEPS_EXTRACT_VERSION_OUTPUTS_VERSION}"
+          echo "✓ docker_tags: ${STEPS_EXTRACT_VERSION_OUTPUTS_DOCKER_TAGS}"
+          echo "✓ registry_image: ${STEPS_EXTRACT_VERSION_OUTPUTS_REGISTRY_IMAGE}"
+        env:
+          STEPS_EXTRACT_VERSION_OUTPUTS_VERSION: ${{ steps.extract_version.outputs.version }}
+          STEPS_EXTRACT_VERSION_OUTPUTS_DOCKER_TAGS: ${{ steps.extract_version.outputs.docker_tags }}
+          STEPS_EXTRACT_VERSION_OUTPUTS_REGISTRY_IMAGE: ${{ steps.extract_version.outputs.registry_image }}
       - name: Cache NPM
-        uses: runs-on/cache@v5
+        uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
         with:
           path: |
             frontend/node_modules
@@ -109,17 +114,18 @@ jobs:
           key: nodejs-x64-${{ hashFiles('**/package-lock.json') }}
           restore-keys: nodejs-x64-
       - name: Cache angular
-        uses: runs-on/cache@v5
+        uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
         with:
           path: frontend/.angular
           key: angular-${{ github.ref }}
           restore-keys: angular-
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
         with:
           bundler-cache: true
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 22.15
+          package-manager-cache: false
           cache: npm
           cache-dependency-path: |
             package-lock.json
@@ -129,7 +135,7 @@ jobs:
           ./docker/prod/setup/precompile-assets.sh
           # public/assets will be saved as artifact, so temporarily copying config file there as well
           cp config/frontend_assets.manifest.json public/assets/frontend_assets.manifest.json
-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           path: public/
           name: public-assets-${{ inputs.tag }}-${{ github.sha }}
@@ -146,7 +152,7 @@ jobs:
     needs:
       - setup
     runs-on:
-      labels: "runs-on=${{ github.run_id }}/ssh=false/${{ matrix.runner }}/volume=100g"
+      labels: "runs-on=${{ github.run_id }}/ssh=false/${{ matrix.runner }}/volume=200g"
     strategy:
       matrix:
         include:
@@ -177,14 +183,15 @@ jobs:
             runner: runner=4cpu-linux-arm64
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ inputs.branch }}
+          persist-credentials: false
       - name: Prepare docker files
         run: |
           cp ./docker/prod/Dockerfile ./Dockerfile
       - name: Download precompiled public assets
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: public-assets-${{ inputs.tag }}-${{ github.sha }}
           path: public/
@@ -198,23 +205,25 @@ jobs:
           echo '!/public/assets' >> .dockerignore
           echo '!/config/frontend_assets.manifest.json' >> .dockerignore
       - name: Add build information
+        env:
+          INPUTS_BRANCH: ${{ inputs.branch }}
         run: |
-          echo "${{ inputs.branch }}" > PRODUCT_VERSION
-          echo "https://github.com/opf/openproject/commits/${{ inputs.branch }}" > PRODUCT_URL
+          echo "$INPUTS_BRANCH" > PRODUCT_VERSION
+          echo "https://github.com/opf/openproject/commits/$INPUTS_BRANCH" > PRODUCT_URL
           date -u +"%Y-%m-%dT%H:%M:%SZ" > RELEASE_DATE
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6
         with:
           context: git
           labels: |
@@ -229,7 +238,7 @@ jobs:
             ${{ needs.setup.outputs.registry_image }}
       - name: Restore vendor/bundle
         id: restore-vendor-bundle
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: |
             vendor/bundle
@@ -239,7 +248,7 @@ jobs:
           sed -i 's/vendor\/bundle//g' .dockerignore
       - name: Build image
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -254,8 +263,10 @@ jobs:
           cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/trixie,manifests_prefix=cache/${{ github.repository }}/trixie,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/trixie,manifests_prefix=cache/${{ github.repository }}/trixie,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
       - name: Extract vendor/bundle from container
+        env:
+          STEPS_BUILD_OUTPUTS_IMAGEID: ${{ steps.build.outputs.imageid }}
         run: |
-          docker create --name bundle ${{ steps.build.outputs.imageid }}
+          docker create --name bundle $STEPS_BUILD_OUTPUTS_IMAGEID
           if [ -d vendor/bundle ]; then
             mv vendor/bundle vendor/bundle.bak
           fi
@@ -263,7 +274,7 @@ jobs:
           docker rm bundle
       - name: Save vendor/bundle
         id: save-vendor-bundle
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: |
             vendor/bundle
@@ -276,14 +287,16 @@ jobs:
             mv vendor/bundle.bak vendor/bundle
           fi
       - name: Validate image
+        env:
+          STEPS_BUILD_OUTPUTS_IMAGEID: ${{ steps.build.outputs.imageid }}
         run: |
           ./script/ci/docker_validate_image.sh \
-            --image "${{ steps.build.outputs.imageid }}" \
+            --image "$STEPS_BUILD_OUTPUTS_IMAGEID" \
             --target "${{ matrix.target }}" \
             --platform "${{ matrix.platform }}"
       - name: Push image
         id: push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -295,12 +308,14 @@ jobs:
           cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/trixie,manifests_prefix=cache/${{ github.repository }}/trixie,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/trixie,manifests_prefix=cache/${{ github.repository }}/trixie,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
       - name: Export digest
+        env:
+          STEPS_PUSH_OUTPUTS_DIGEST: ${{ steps.push.outputs.digest }}
         run: |
           mkdir -p /tmp/digests
-          digest="${{ steps.push.outputs.digest }}"
+          digest="$STEPS_PUSH_OUTPUTS_DIGEST"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: digests-${{ inputs.tag }}-${{ matrix.target }}--${{ matrix.digest }}
           path: /tmp/digests/*
@@ -316,13 +331,13 @@ jobs:
       - build
     steps:
       - name: Merge digests
-        uses: actions/upload-artifact/merge@v7
+        uses: actions/upload-artifact/merge@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           pattern: "digests-${{ inputs.tag }}-${{ matrix.target }}--*"
           overwrite: true
           name: "merged-digests-${{ inputs.tag }}-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}"
       - name: Download digests
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: "merged-digests-${{ inputs.tag }}-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}"
           path: /tmp/digests
@@ -333,10 +348,10 @@ jobs:
           if [ "$suffix" = "-all-in-one" ]; then suffix="" ; fi
           echo "suffix=$suffix" >> "$GITHUB_OUTPUT"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6
         with:
           images: ${{ needs.setup.outputs.registry_image }}
           labels: |
@@ -351,7 +366,7 @@ jobs:
           tags: |
             ${{ needs.setup.outputs.docker_tags }}
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -359,10 +374,15 @@ jobs:
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ needs.setup.outputs.registry_image }}@sha256:%s ' *)
+            $(printf '${NEEDS_SETUP_OUTPUTS_REGISTRY_IMAGE}@sha256:%s ' *)
+        env:
+          NEEDS_SETUP_OUTPUTS_REGISTRY_IMAGE: ${{ needs.setup.outputs.registry_image }}
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ needs.setup.outputs.registry_image }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${NEEDS_SETUP_OUTPUTS_REGISTRY_IMAGE}:${STEPS_META_OUTPUTS_VERSION}
+        env:
+          NEEDS_SETUP_OUTPUTS_REGISTRY_IMAGE: ${{ needs.setup.outputs.registry_image }}
+          STEPS_META_OUTPUTS_VERSION: ${{ steps.meta.outputs.version }}
   notify-failure:
     needs: [setup, build, merge]
     if: ${{ always() && contains(needs.*.result, 'failure') }}
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 3de0e880f00..b9545e43ed1 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -17,8 +17,10 @@ jobs:
     name: Check internal links in documentation
     runs-on: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v6
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
         with:
           bundler-cache: true
       - run: bundle exec ./script/docs/check_links
@@ -26,14 +28,18 @@ jobs:
     name: Check README.md case in documentation
     runs-on: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
       - run: script/docs/check_readme_case
   docs-readme-yaml-header-syntax-check:
     name: Check README.md YAML header syntax in documentation
     runs-on: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v6
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
         with:
           bundler-cache: true
       - run: script/docs/check_readme_yaml_header_syntax
diff --git a/.github/workflows/email-notification.yml b/.github/workflows/email-notification.yml
index 99326b91b4e..cf5dba17ae0 100644
--- a/.github/workflows/email-notification.yml
+++ b/.github/workflows/email-notification.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Send mail
-        uses: dawidd6/action-send-mail@v16
+        uses: dawidd6/action-send-mail@d38f3f7cd391cdebfe0d38efc3998b935e951c4f # v16
         with:
           subject: ${{ inputs.subject }}
           body: ${{ inputs.body }}
diff --git a/.github/workflows/eslint-core.yml b/.github/workflows/eslint-core.yml
index 06372ca61b9..19e26516290 100644
--- a/.github/workflows/eslint-core.yml
+++ b/.github/workflows/eslint-core.yml
@@ -13,16 +13,21 @@ jobs:
   eslint:
     name: eslint
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v6
+          persist-credentials: false
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: '22.15'
+          package-manager-cache: false
           cache: npm
           cache-dependency-path: frontend/package-lock.json
-      - uses: reviewdog/action-eslint@v1
+      - uses: reviewdog/action-eslint@556a3fdaf8b4201d4d74d406013386aa4f7dab96 # v1
         with:
           reporter: github-pr-check
           workdir: 'frontend/'
diff --git a/.github/workflows/hocuspocus-docker.yml b/.github/workflows/hocuspocus-docker.yml
index c260eb6215a..5fb928107f4 100644
--- a/.github/workflows/hocuspocus-docker.yml
+++ b/.github/workflows/hocuspocus-docker.yml
@@ -52,12 +52,16 @@ on:
 
 jobs:
   build:
+    if: github.repository == 'opf/openproject'
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ inputs.branch }} # this is empty on push, so it just checks out the event SHA in that case
+          persist-credentials: false
       - name: Include Git SHA in package.json version
         id: short-sha
         run: |
@@ -85,31 +89,37 @@ jobs:
           BRANCH=$(echo "${INPUT_BRANCH:-$FALLBACK_BRANCH}" | tr / -)
           SPECIFIC_TAG=$BRANCH-$SHORT_SHA
           LATEST_TAG=$BRANCH-latest
+          MINOR_TAG=
+          MAJOR_TAG=
 
           if [ -n "$INPUT_TAG" ]; then
             SPECIFIC_TAG=$(echo "$INPUT_TAG" | tr -d v)
             LATEST_TAG=latest
+            MINOR_TAG=$(echo $SPECIFIC_TAG | cut -d. -f1-2)
+            MAJOR_TAG=$(echo $SPECIFIC_TAG | cut -d. -f1)
           fi
 
           echo 'tags<<EOF' >> $GITHUB_OUTPUT
           echo $REGISTRY:$SPECIFIC_TAG >> $GITHUB_OUTPUT
           echo $REGISTRY:$LATEST_TAG >> $GITHUB_OUTPUT
+          [ -n "$MINOR_TAG" ] && echo $REGISTRY:$MINOR_TAG >> $GITHUB_OUTPUT
+          [ -n "$MAJOR_TAG" ] && echo $REGISTRY:$MAJOR_TAG >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
 
       - name: Build and push
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
         with:
           context: extensions/op-blocknote-hocuspocus
           push: true
@@ -121,11 +131,13 @@ jobs:
       - name: Summarize build
         run: |
           echo "Built and pushed the following tags:" >> $GITHUB_STEP_SUMMARY
-          echo "${{ steps.tags.outputs.tags }}" >> $GITHUB_STEP_SUMMARY
+          echo "${STEPS_TAGS_OUTPUTS_TAGS}" >> $GITHUB_STEP_SUMMARY
+        env:
+          STEPS_TAGS_OUTPUTS_TAGS: ${{ steps.tags.outputs.tags }}
 
       - name: Generate GHA token
         id: generate-gha-token
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3
         with:
           app-id: ${{ vars.DEPLOY_APP_ID }}
           private-key: ${{ secrets.DEPLOY_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/hocuspocus-test.yml b/.github/workflows/hocuspocus-test.yml
index 17af080cb10..053fae2239e 100644
--- a/.github/workflows/hocuspocus-test.yml
+++ b/.github/workflows/hocuspocus-test.yml
@@ -18,19 +18,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
+          persist-credentials: false
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: '22.19'
+          package-manager-cache: false
           cache: npm
           cache-dependency-path: extensions/op-blocknote-hocuspocus/package-lock.json
 
       - name: Install Dependencies
-        id: npm-i
-        run: npm i
+        id: npm-ci
+        run: npm ci
 
       - name: run tests
         id: npm-test
diff --git a/.github/workflows/i18n-tasks.yml b/.github/workflows/i18n-tasks.yml
index 07dcacf8cb2..e618e573fa0 100644
--- a/.github/workflows/i18n-tasks.yml
+++ b/.github/workflows/i18n-tasks.yml
@@ -28,10 +28,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
 
       - name: Setup i18n-tasks
         run: |
diff --git a/.github/workflows/openapi.yaml b/.github/workflows/openapi.yaml
index bd2218b39d8..57d427055d7 100644
--- a/.github/workflows/openapi.yaml
+++ b/.github/workflows/openapi.yaml
@@ -17,12 +17,17 @@ jobs:
     name: APIv3 specification (OpenAPI 3.0)
     if: github.repository_owner == 'opf'
     runs-on: [ubuntu-latest]
+    permissions:
+      contents: read
     steps:
-    - uses: actions/checkout@v6
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       with:
-        bundler-cache: true
-    - uses: actions/setup-node@v6
+        persist-credentials: false
+    - uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
+      with:
+        bundler-cache: false
+    - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
       with:
         node-version: '20'
+        package-manager-cache: false
     - run: ./script/api/validate_spec
diff --git a/.github/workflows/packager.yml b/.github/workflows/packager.yml
index 095491ece13..96c2e9ae8b8 100644
--- a/.github/workflows/packager.yml
+++ b/.github/workflows/packager.yml
@@ -15,6 +15,8 @@ jobs:
     if: github.repository == 'opf/openproject'
     name: ${{ matrix.target }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     services:
       postgres:
         image: postgres:16
@@ -35,22 +37,23 @@ jobs:
           - el:9
           - sles:15
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
+          persist-credentials: false
       - name: Setup
         id: setup
         run: |
           VERSION=$(ruby -r ./lib/open_project/version.rb -e "puts OpenProject::VERSION")
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-          if [[ "${{ github.ref_type }}" == "tag" ]]; then
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
             MAJOR=$(ruby -r ./lib/open_project/version.rb -e "puts OpenProject::VERSION::MAJOR")
             echo "channel=stable/${MAJOR}" >> $GITHUB_OUTPUT
           else
-            echo "channel=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+            echo "channel=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
           fi
       - name: Package
-        uses: pkgr/action/package@main
+        uses: pkgr/action/package@c5666febcd31750da6428042193fc5b2fb765435 # main
         id: package
         with:
           target: ${{ matrix.target }}
@@ -60,7 +63,7 @@ jobs:
           env: |
             DATABASE_URL=postgres://app:p4ssw0rd@127.0.0.1:5432/app
       - name: Publish
-        uses: pkgr/action/publish@main
+        uses: pkgr/action/publish@c5666febcd31750da6428042193fc5b2fb765435 # main
         with:
           target: ${{ matrix.target }}
           token: ${{ secrets.PACKAGER_PUBLISH_TOKEN }}
diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml
index bc62f22c36f..03e5606bdcd 100644
--- a/.github/workflows/pullpreview.yml
+++ b/.github/workflows/pullpreview.yml
@@ -19,7 +19,9 @@ jobs:
     runs-on: ubuntu-slim
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      with:
+        persist-credentials: false
     - name: Generate .env.pullpreview file
       run: |
         echo "OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET=false" >> .env.pullpreview
@@ -41,7 +43,7 @@ jobs:
         cp ./docker/pullpreview/docker-compose.yml ./docker-compose.pullpreview.yml
         cp ./docker/pullpreview/Caddyfile ./Caddyfile
         cp ./docker/prod/Dockerfile ./Dockerfile
-    - uses: pullpreview/action@v6
+    - uses: pullpreview/action@0dc5a741255c0afdd5a9e23e9264d6376652ec8e # v6
       with:
         # allows to ssh to the instance using our GitHub ssh key
         admins: "crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,cbliard,@collaborators/push"
diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml
index 8a2b2b97295..3071a5aeb7e 100644
--- a/.github/workflows/rubocop-core.yml
+++ b/.github/workflows/rubocop-core.yml
@@ -9,13 +9,18 @@ jobs:
   rubocop:
     name: rubocop
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
       - name: Run Rubocop
-        uses: reviewdog/action-rubocop@v2
+        uses: reviewdog/action-rubocop@b6d5e953a5fc0bf3ab65254e77730ea2174d6d6d # v2
         with:
           github_token: ${{ secrets.github_token }}
           rubocop_version: gemfile
@@ -32,7 +37,7 @@ jobs:
       - name: Install erb_lint
         run: gem install -N erb_lint erblint-github
       - name: Run erb-lint
-        uses: tk0miya/action-erblint@v1
+        uses: tk0miya/action-erblint@44c5fe3552356fe8bff23f30d534aa4258aa3f7b # v1
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-check
diff --git a/.github/workflows/seed-all-locales.yml b/.github/workflows/seed-all-locales.yml
index 8d90c03eb34..a6fea961d3d 100644
--- a/.github/workflows/seed-all-locales.yml
+++ b/.github/workflows/seed-all-locales.yml
@@ -41,15 +41,18 @@ jobs:
           fi
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ steps.use_input_or_find_latest_release.outputs.ref }}
+          persist-credentials: false
 
       - name: Print ref to summary
         run: |
           SHA=$(git rev-parse HEAD)
           SHORT_SHA=$(git rev-parse --short HEAD)
-          echo "Testing seeding on **${{ steps.use_input_or_find_latest_release.outputs.ref }}** ([$SHORT_SHA](https://github.com/opf/openproject/commit/$SHA))" >> "$GITHUB_STEP_SUMMARY"
+          echo "Testing seeding on **${STEPS_USE_INPUT_OR_FIND_LATEST_RELEASE_OUTPUTS_REF}** ([$SHORT_SHA](https://github.com/opf/openproject/commit/$SHA))" >> "$GITHUB_STEP_SUMMARY"
+        env:
+          STEPS_USE_INPUT_OR_FIND_LATEST_RELEASE_OUTPUTS_REF: ${{ steps.use_input_or_find_latest_release.outputs.ref }}
 
       - name: List available locales
         id: list
@@ -86,15 +89,16 @@ jobs:
       RAILS_ENV: development
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ needs.prepare.outputs.ref }}
+          persist-credentials: false
 
       - name: Install system dependencies
         run: sudo apt-get update && sudo apt-get install -y libpq-dev
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
         with:
           bundler-cache: true
 
@@ -109,7 +113,8 @@ jobs:
         env:
           SILENCE_SQL_LOGS: 1
           OPENPROJECT_EDITION: ${{ matrix.edition }}
-        run: ruby script/i18n/test_seed_all_locales ${{ matrix.locale }}
+          MATRIX_LOCALE: ${{ matrix.locale }}
+        run: ruby script/i18n/test_seed_all_locales ${MATRIX_LOCALE}
 
   notify-failure:
     needs: [prepare, seed]
diff --git a/.github/workflows/sync-internal-fork.yml b/.github/workflows/sync-internal-fork.yml
index 454ce6f4ddc..fe526b8979c 100644
--- a/.github/workflows/sync-internal-fork.yml
+++ b/.github/workflows/sync-internal-fork.yml
@@ -10,10 +10,11 @@ jobs:
     # Only run in the private fork, never in the public repo
     if: github.repository == 'opf/openproject-internal-fork'
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
           token: ${{ secrets.OPENPROJECTCI_GH_FORK_TOKEN }}
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index bff718303ff..c13182f3952 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -26,19 +26,19 @@ jobs:
     name: Units + Features
     if: github.repository_owner == 'opf'
     runs-on:
-      labels: "runs-on=${{ github.run_id }}/image=ubuntu24-full-x64/family=m7+c7+r7+i7+r8/ram=128+256/cpu=32"
+      labels: "runs-on=${{ github.run_id }}/image=ubuntu24-full-x64/family=m8azn+m8+m7+i7+r8/ram=128+256/cpu=24+32/volume=50gb"
     timeout-minutes: 40
     env:
       DOCKER_BUILDKIT: 1
       CI_RETRY_COUNT: 3
     steps:
-    - uses: runs-on/action@v2
+    - uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       with:
-        metrics: cpu,memory,disk,io,network
-    - uses: actions/checkout@v6
+        persist-credentials: false
     - name: Cache DOCKER
       id: cache_docker
-      uses: runs-on/cache@v5
+      uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
       with:
         path: cache/docker
         # Note: no restore keys since whenever the files below change, we want to rebuild the full image from scratch
@@ -47,28 +47,28 @@ jobs:
       if: steps.cache_docker.outputs.cache-hit == 'true'
       run: docker load -i cache/docker/image.tar
     - name: Cache GEM
-      uses: runs-on/cache@v5
+      uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
       with:
         path: cache/bundle
         key: gem-trixie-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
           gem-trixie-${{ hashFiles('.ruby-version') }}-
     - name: Cache NPM
-      uses: runs-on/cache@v5
+      uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
       with:
         path: cache/node
         key: node-${{ hashFiles('package.json', 'frontend/package-lock.json') }}
         restore-keys: |
           node-
     - name: Cache ANGULAR
-      uses: runs-on/cache@v5
+      uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
       with:
         path: cache/angular
         key: angular-${{ hashFiles('package.json', 'frontend/package-lock.json') }}
         restore-keys: |
           angular-
     - name: Cache TEST RUNTIME
-      uses: runs-on/cache@v5
+      uses: runs-on/cache@bd330c5a5f6cbb837823ee25864f3c71a211c2e3 # v5
       with:
         path: cache/runtime-logs
         key: runtime-logs-${{ github.head_ref || github.ref }}-${{ github.sha }}
diff --git a/.github/workflows/test-frontend-unit.yml b/.github/workflows/test-frontend-unit.yml
index dc70bbc92e4..0b072098376 100644
--- a/.github/workflows/test-frontend-unit.yml
+++ b/.github/workflows/test-frontend-unit.yml
@@ -26,29 +26,37 @@ defaults:
     working-directory: ./frontend
 
 jobs:
-  units:
-    name: Units
+  unit:
+    name: Units (${{ matrix.browser }})
     runs-on: ubuntu-latest
-  
+    strategy:
+      fail-fast: false
+      matrix:
+        browser: [chromium, firefox, webkit]
+
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
-          
-      - uses: actions/setup-node@v6
+
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: '22.15'
-          cache: npm
-          cache-dependency-path: frontend/package-lock.json
+          package-manager-cache: false
 
       - name: Install Dependencies
-        id: npm-i
-        run: npm i
+        run: npm ci
 
       - name: Register plugins
-        id: npm-run-ci-plugins-register-frontend
         run: npm run ci:plugins:register_frontend
 
-      - name: Test (Angular)
-        id: npm-test
-        run: npm test
+      - name: Install Playwright dependencies
+        timeout-minutes: 5
+        run: npx playwright install-deps ${{ matrix.browser }}
+
+      - name: Install Playwright Browser
+        timeout-minutes: 5
+        run: npx playwright install --only-shell ${{ matrix.browser }}
+
+      - name: Test
+        run: npm test -- --browsers ${{ matrix.browser }} --reporters dot --reporters github-actions
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
index 3798a0269fc..05b831e19f6 100644
--- a/.github/workflows/version-check.yml
+++ b/.github/workflows/version-check.yml
@@ -19,10 +19,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1
 
       - name: Verify linked version matches core version
         id: version-check
@@ -32,7 +34,7 @@ jobs:
 
       - name: Add comment if versions differ
         if: steps.version-check.outputs.version_mismatch == 'true'
-        uses: marocchino/sticky-pull-request-comment@v3
+        uses: marocchino/sticky-pull-request-comment@d4d6b0936434b21bc8345ad45a440c5f7d2c40ff # v3
         with:
           header: version-mismatch-comment
           message: |
@@ -50,7 +52,7 @@ jobs:
              - The work package version OR your pull request target branch is correct
       - name: Version check passed
         if: steps.version-check.outputs.version_mismatch != 'true'
-        uses: marocchino/sticky-pull-request-comment@v3
+        uses: marocchino/sticky-pull-request-comment@d4d6b0936434b21bc8345ad45a440c5f7d2c40ff # v3
         with:
           header: version-mismatch-comment
           delete: true
diff --git a/.github/workflows/zizmor-scan.yml b/.github/workflows/zizmor-scan.yml
new file mode 100644
index 00000000000..fc5f85283d3
--- /dev/null
+++ b/.github/workflows/zizmor-scan.yml
@@ -0,0 +1,30 @@
+name: GitHub Actions Security Analysis with zizmor 🌈
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/**"
+      - ".github/actions/**"
+  schedule:
+    - cron: "0 2 * * *"
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  zizmor:
+    name: Run zizmor 🌈
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'opf'
+    permissions:
+      security-events: write # Required for upload-sarif
+      contents: read
+      actions: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Run zizmor 🌈
+        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
diff --git a/.github/zizmor.yml b/.github/zizmor.yml
new file mode 100644
index 00000000000..d4ca85896d8
--- /dev/null
+++ b/.github/zizmor.yml
@@ -0,0 +1,16 @@
+rules:
+  artipacked:
+    ignore:
+      # These workflows intentionally persist credentials because they push commits/branches
+      - create-merge-from-previous-release-branch-pr.yml
+      - create-merge-release-into-dev-pr.yml
+      - crowdin.yml
+      - sync-internal-fork.yml
+  dangerous-triggers:
+    ignore:
+      # CLA workflow intentionally uses pull_request_target to handle outside contributors
+      - cla.yml
+  cache-poisoning:
+    ignore:
+      # Frontend unit tests cache npm packages; only triggered on push/PR from trusted branches
+      - test-frontend-unit.yml
diff --git a/.pkgr.yml b/.pkgr.yml
index 014e23e2bb1..7f7947a1976 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -27,6 +27,7 @@ targets:
       - NODE_ENV=production
       - NPM_CONFIG_PRODUCTION=false
       - SECRET_KEY_BASE=1
+      - OPENPROJECT_DISABLE__SECRET_KEY_BASE__CHECK=true
     dependencies:
       - epel-release
       - ImageMagick
diff --git a/.rubocop.yml b/.rubocop.yml
index 415242606cd..6b64ca674d8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -142,6 +142,11 @@ Naming/ClassAndModuleCamelCase:
 Naming/FileName:
   Enabled: false
 
+Naming/MethodParameterName:
+  AllowedNames:
+    - id
+    - cf # custom fields are commonly abbreviated like that
+
 Naming/PredicatePrefix:
   ForbiddenPrefixes:
     - is_
diff --git a/Gemfile b/Gemfile
index cfee700ee02..0b047927919 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,14 +62,14 @@ gem "warden-basic_auth", "~> 0.2.1"
 gem "pagy"
 gem "will_paginate", "~> 4.0.0"
 
-gem "friendly_id", "~> 5.6.0"
+gem "friendly_id", "~> 5.7.0"
 
 gem "scimitar", "~> 2.13"
 
 gem "acts_as_list", "~> 1.2.6"
 gem "acts_as_tree", "~> 2.9.0"
 gem "awesome_nested_set", "~> 3.9.0"
-gem "closure_tree", "~> 9.6.1"
+gem "closure_tree", "~> 9.7.0"
 gem "rubytree", "~> 2.2.0"
 
 gem "addressable", "~> 2.9.0"
@@ -87,7 +87,7 @@ gem "htmldiff"
 gem "stringex", "~> 2.8.5"
 
 # CommonMark markdown parser with GFM extension
-gem "commonmarker", "~> 2.8.0"
+gem "commonmarker", "~> 2.8.2"
 
 # HTML pipeline for transformations on text formatter output
 # such as sanitization or additional features
@@ -201,8 +201,8 @@ gem "nokogiri", "~> 1.19.2"
 
 gem "carrierwave", "~> 2.2.6"
 gem "carrierwave_direct", "~> 3.0.0"
-gem "ssrf_filter", "~> 1.3"
 gem "fog-aws"
+gem "ssrf_filter", "~> 1.3"
 
 gem "aws-sdk-core", "~> 3.244"
 # File upload via fog + screenshots on travis
@@ -219,7 +219,7 @@ gem "mini_magick", "~> 5.3.0", require: false
 gem "validate_url"
 
 # Storages support code
-gem "dry-container"
+gem "dry-core"
 gem "dry-monads"
 gem "dry-validation"
 
@@ -236,18 +236,18 @@ gem "yabeda-puma-plugin"
 gem "yabeda-rails"
 
 # opentelemetry
-gem "opentelemetry-exporter-otlp", "~> 0.33.0", require: false
+gem "opentelemetry-exporter-otlp", "~> 0.34.0", require: false
 gem "opentelemetry-instrumentation-all", "~> 0.93.0", require: false
 gem "opentelemetry-sdk", "~> 1.10", require: false
 
-gem "view_component", "~> 4.9.0"
+gem "view_component", "~> 4.10.0"
 # Lookbook
 gem "lookbook", "2.3.14"
 
 gem "inline_svg", "~> 1.10.0"
 
 # Require factory_bot for usage with openproject plugins testing
-gem "factory_bot", "~> 6.5.6", require: false
+gem "factory_bot", "~> 6.6.0", require: false
 # require factory_bot_rails for convenience in core development
 gem "factory_bot_rails", "~> 6.5.0", require: false
 
@@ -365,7 +365,7 @@ group :development, :test do
   gem "rubocop-factory_bot", require: false
   gem "rubocop-openproject", require: false
   gem "rubocop-performance", require: false
-  gem "rubocop-rails", "~> 2.34.2"
+  gem "rubocop-rails", "~> 2.35.1"
   gem "rubocop-rspec", require: false
   gem "rubocop-rspec_rails", require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6a222201d7f..faa7638310f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -242,7 +242,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (2.0.1)
-    action_text-trix (2.1.18)
+    action_text-trix (2.1.19)
       railties
     actioncable (8.1.3)
       actionpack (= 8.1.3)
@@ -361,8 +361,8 @@ GEM
     awesome_nested_set (3.9.0)
       activerecord (>= 4.0.0, < 8.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1242.0)
-    aws-sdk-core (3.246.0)
+    aws-partitions (1.1249.0)
+    aws-sdk-core (3.247.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -370,11 +370,11 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.124.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-kms (1.125.0)
+      aws-sdk-core (~> 3, >= 3.247.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-s3 (1.222.0)
+      aws-sdk-core (~> 3, >= 3.247.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sdk-sns (1.113.0)
@@ -441,7 +441,7 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     climate_control (1.2.0)
-    closure_tree (9.6.1)
+    closure_tree (9.7.0)
       activerecord (>= 7.2.0)
       with_advisory_lock (>= 7.5.0)
       zeitwerk (~> 2.7)
@@ -450,13 +450,13 @@ GEM
       descendants_tracker (~> 0.0.1)
     color_conversion (0.1.2)
     colored2 (4.0.3)
-    commonmarker (2.8.1-aarch64-linux)
-    commonmarker (2.8.1-aarch64-linux-musl)
-    commonmarker (2.8.1-arm-linux)
-    commonmarker (2.8.1-arm64-darwin)
-    commonmarker (2.8.1-x86_64-darwin)
-    commonmarker (2.8.1-x86_64-linux)
-    commonmarker (2.8.1-x86_64-linux-musl)
+    commonmarker (2.8.2-aarch64-linux)
+    commonmarker (2.8.2-aarch64-linux-musl)
+    commonmarker (2.8.2-arm-linux)
+    commonmarker (2.8.2-arm64-darwin)
+    commonmarker (2.8.2-x86_64-darwin)
+    commonmarker (2.8.2-x86_64-linux)
+    commonmarker (2.8.2-x86_64-linux-musl)
     compare-xml (0.66)
       nokogiri (~> 1.8)
     concurrent-ruby (1.3.6)
@@ -472,14 +472,14 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (2.1.0)
+    css_parser (2.2.0)
       addressable
     csv (3.3.5)
     cuprite (0.17)
       capybara (~> 3.0)
       ferrum (~> 0.17.0)
     daemons (1.4.1)
-    dalli (5.0.2)
+    dalli (5.0.4)
       logger
     date (3.5.1)
     date_validator (0.12.0)
@@ -504,11 +504,9 @@ GEM
       dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
-    dry-configurable (1.3.0)
-      dry-core (~> 1.1)
+    dry-configurable (1.4.0)
+      dry-core (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
     dry-core (1.2.0)
       concurrent-ruby (~> 1.0)
       logger
@@ -578,12 +576,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     excon (1.4.2)
       logger
-    factory_bot (6.5.6)
+    factory_bot (6.6.0)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faraday (2.14.1)
+    faraday (2.14.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -624,7 +622,7 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.2.3)
       reline
-    friendly_id (5.6.0)
+    friendly_id (5.7.0)
       activerecord (>= 4.0.0)
     front_matter_parser (1.0.1)
     fugit (1.12.1)
@@ -651,7 +649,7 @@ GEM
       mini_mime (~> 1.1)
       representable (~> 3.0)
       retriable (~> 3.1)
-    google-apis-gmail_v1 (0.48.0)
+    google-apis-gmail_v1 (0.49.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-cloud-env (2.3.1)
       base64 (~> 0.2)
@@ -714,7 +712,7 @@ GEM
     htmlentities (4.3.4)
     http-2 (1.1.3)
     http_parser.rb (0.8.1)
-    httpx (1.7.6)
+    httpx (1.7.8)
       http-2 (>= 1.1.3)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
@@ -733,7 +731,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
-    icalendar (2.12.2)
+    icalendar (2.12.3)
       base64
       ice_cube (~> 0.16)
       logger
@@ -755,8 +753,8 @@ GEM
       reline (>= 0.4.2)
     iso8601 (0.13.0)
     jmespath (1.6.2)
-    job-iteration (1.13.1)
-      activejob (>= 7.0)
+    job-iteration (1.14.0)
+      activejob (>= 7.1)
     json (2.19.5)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
@@ -776,7 +774,7 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (3.1.2)
+    jwt (3.2.0)
       base64
     ladle (1.0.1)
       open4 (~> 1.0)
@@ -884,7 +882,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.19.3-x86_64-linux-musl)
       racc (~> 1.4)
-    oj (3.17.0)
+    oj (3.17.1)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     okcomputer (1.19.1)
@@ -918,14 +916,14 @@ GEM
       view_component (>= 3.1, < 5.0)
     openproject-token (8.8.2)
       activemodel
-    openssl (4.0.1)
+    openssl (4.0.2)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    opentelemetry-api (1.9.0)
+    opentelemetry-api (1.10.0)
       logger
-    opentelemetry-common (0.24.0)
+    opentelemetry-common (0.25.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.33.0)
+    opentelemetry-exporter-otlp (0.34.0)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -1086,22 +1084,22 @@ GEM
       opentelemetry-helpers-sql-processor
       opentelemetry-instrumentation-base (~> 0.25)
       opentelemetry-semantic_conventions (>= 1.8.0)
-    opentelemetry-registry (0.5.0)
+    opentelemetry-registry (0.6.0)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.11.0)
+    opentelemetry-sdk (1.12.0)
       logger
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.37.0)
+    opentelemetry-semantic_conventions (1.37.1)
       opentelemetry-api (~> 1.0)
     optimist (3.2.1)
     os (1.1.4)
     ostruct (0.6.3)
-    ox (2.14.25)
+    ox (2.14.26)
       bigdecimal (>= 3.0)
-    pagy (43.5.3)
+    pagy (43.5.4)
       json
       uri
       yaml
@@ -1199,7 +1197,7 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.8.0)
       multi_json
-    puma (8.0.0)
+    puma (8.0.1)
       nio4r (~> 2.0)
     puma-plugin-statsd (2.8.0)
       puma (>= 5.0, < 9)
@@ -1276,7 +1274,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rb_sys (0.9.127)
+    rb_sys (0.9.128)
       rake-compiler-dock (= 1.12.0)
     rbtrace (0.5.3)
       ffi (>= 1.0.6)
@@ -1291,7 +1289,7 @@ GEM
     redcarpet (3.6.1)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.28.0)
+    redis-client (0.29.0)
       connection_pool
     regexp_parser (2.12.0)
     reline (0.6.3)
@@ -1337,7 +1335,7 @@ GEM
     rspec-support (3.13.7)
     rspec-wait (1.0.2)
       rspec (>= 3.4)
-    rubocop (1.86.1)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -1363,7 +1361,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.34.3)
+    rubocop-rails (2.35.1)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -1404,9 +1402,9 @@ GEM
     scimitar (2.15.0)
       rails (>= 7.0)
     securerandom (0.4.1)
-    selenium-devtools (0.147.0)
+    selenium-devtools (0.148.0)
       selenium-webdriver (~> 4.2)
-    selenium-webdriver (4.43.0)
+    selenium-webdriver (4.44.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -1427,7 +1425,7 @@ GEM
       bigdecimal
       logger
       ruby-ole
-    spring (4.4.2)
+    spring (4.5.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-commands-rubocop (0.4.0)
@@ -1494,8 +1492,8 @@ GEM
       activemodel (>= 3.0.0)
       public_suffix
     vcr (6.4.0)
-    vernier (1.10.0)
-    view_component (4.9.0)
+    vernier (1.10.1)
+    view_component (4.10.0)
       actionview (>= 7.1.0)
       activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)
@@ -1599,9 +1597,9 @@ DEPENDENCIES
   carrierwave (~> 2.2.6)
   carrierwave_direct (~> 3.0.0)
   climate_control
-  closure_tree (~> 9.6.1)
+  closure_tree (~> 9.7.0)
   colored2
-  commonmarker (~> 2.8.0)
+  commonmarker (~> 2.8.2)
   compare-xml (~> 0.66)
   connection_pool (~> 3.0.2)
   costs!
@@ -1616,7 +1614,7 @@ DEPENDENCIES
   disposable (~> 0.6.2)
   doorkeeper (~> 5.9.0)
   dotenv-rails
-  dry-container
+  dry-core
   dry-monads
   dry-validation
   email_validator (~> 2.2.3)
@@ -1624,12 +1622,12 @@ DEPENDENCIES
   erb_lint
   erblint-github
   escape_utils (~> 1.3)
-  factory_bot (~> 6.5.6)
+  factory_bot (~> 6.6.0)
   factory_bot_rails (~> 6.5.0)
   ffi (~> 1.17)
   flamegraph
   fog-aws
-  friendly_id (~> 5.6.0)
+  friendly_id (~> 5.7.0)
   fuubar (~> 2.5.0)
   globalid (~> 1.3)
   good_job (~> 4.18.2)
@@ -1700,7 +1698,7 @@ DEPENDENCIES
   openproject-webhooks!
   openproject-wikis!
   openproject-xls_export!
-  opentelemetry-exporter-otlp (~> 0.33.0)
+  opentelemetry-exporter-otlp (~> 0.34.0)
   opentelemetry-instrumentation-all (~> 0.93.0)
   opentelemetry-sdk (~> 1.10)
   overviews!
@@ -1747,7 +1745,7 @@ DEPENDENCIES
   rubocop-factory_bot
   rubocop-openproject
   rubocop-performance
-  rubocop-rails (~> 2.34.2)
+  rubocop-rails (~> 2.35.1)
   rubocop-rspec
   rubocop-rspec_rails
   ruby-duration (~> 3.2.0)
@@ -1785,7 +1783,7 @@ DEPENDENCIES
   validate_url
   vcr
   vernier
-  view_component (~> 4.9.0)
+  view_component (~> 4.10.0)
   warden (~> 1.2)
   warden-basic_auth (~> 0.2.1)
   webmock (~> 3.26)
@@ -1798,7 +1796,7 @@ DEPENDENCIES
 
 CHECKSUMS
   Ascii85 (2.0.1) sha256=15cb5d941808543cbb9e7e6aea3c8ec3877f154c3461e8b3673e97f7ecedbe5a
-  action_text-trix (2.1.18) sha256=3fdb83f8bff4145d098be283cdd47ac41caf5110bfa6df4695ed7127d7fb3642
+  action_text-trix (2.1.19) sha256=7012f59421009cf284aa651294896414d653a61a2417c9b8714c8476d2f74009
   actioncable (8.1.3) sha256=e5bc7f75e44e6a22de29c4f43176927c3a9ce4824464b74ed18d8226e75a80f0
   actionmailbox (8.1.3) sha256=df7da474eaa0e70df4ed5a6fef66eb3b3b0f2dbf7f14518deee8d77f1b4aae59
   actionmailer (8.1.3) sha256=831f724891bb70d0aaa4d76581a6321124b6a752cb655c9346aae5479318448d
@@ -1831,10 +1829,10 @@ CHECKSUMS
   auto_strip_attributes (2.6.0) sha256=a7e2e0cf744de2bcd947fd68014220702bcc88c81274c1cd9ce6f7316aae39b0
   awesome_nested_set (3.9.0) sha256=3ce99e816550f97f4de118e621630070aacf24928b920fe4a68846578a8daaed
   aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
-  aws-partitions (1.1242.0) sha256=58886ab5484ccf9287a8d55e603c3c0fb004241dfb4c0c7690b67d18e4c39352
-  aws-sdk-core (3.246.0) sha256=393864ec8948560e69fcccc2e4d256b40c7028eb98930608dd295279e3c4ddcc
-  aws-sdk-kms (1.124.0) sha256=40d00ab706d7e49fd620270bd0dcb546f266295abdd49b54fec2611e2a41f37c
-  aws-sdk-s3 (1.220.0) sha256=237fda5e6ac7ecdd9c848e27187bfdc370edad5c5a141aeec389fb450fa28c7c
+  aws-partitions (1.1249.0) sha256=f0bed070aba353e6ffe439953d6c354b3f51d16770386d2b198e71d34612f2e9
+  aws-sdk-core (3.247.0) sha256=789864594ce8cef05ee3d81fa8ed506099280bda6ea12a7612b8b7c5e5e62851
+  aws-sdk-kms (1.125.0) sha256=23f81bc0838ae6ec2e8de3eae88af521d0e29d3a59b6c9dbb4b21343ba476bc8
+  aws-sdk-s3 (1.222.0) sha256=bae4b06fccf0b81b8d77e7abfc56e5e2146590d43c4ab58db0cee3ff5bbfb7f1
   aws-sdk-sns (1.113.0) sha256=15fe37d010e86f4c28b4c2f2133c463ce5c14189ec3673a1f43c30dfee511b0f
   aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
   axe-core-api (4.11.3) sha256=f5f6e802743644a50e2d8ef24c22aefbb6df49dd169024ff0144b47f37e652ba
@@ -1860,18 +1858,18 @@ CHECKSUMS
   cgi (0.5.1) sha256=e93fcafc69b8a934fe1e6146121fa35430efa8b4a4047c4893764067036f18e9
   childprocess (5.1.0) sha256=9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec
   climate_control (1.2.0) sha256=36b21896193fa8c8536fa1cd843a07cf8ddbd03aaba43665e26c53ec1bd70aa5
-  closure_tree (9.6.1) sha256=f6af11243dea13d888788ffb0fd28014bd1077abe3a4233ea1e7044e52fc6377
+  closure_tree (9.7.0) sha256=54403254741e70b5da35eefffc6b8172505da71c004ff75635f4e1299e6ba44c
   coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
   coercible (1.0.0) sha256=5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc
   color_conversion (0.1.2) sha256=99bea5fa412e1527a11389975aa6ad445ff8528ebae202c11d08c45ea2b94c96
   colored2 (4.0.3) sha256=63e1038183976287efc43034f5cca17fb180b4deef207da8ba78d051cbce2b37
-  commonmarker (2.8.1-aarch64-linux) sha256=f855599cc6855f4137d72dcacae9571451075afe6e6c8522eba353df9b81d0bf
-  commonmarker (2.8.1-aarch64-linux-musl) sha256=bbc2b3d361403431a5aac737dc86997d3b2843276ef395e7499cf17ad48e1b2c
-  commonmarker (2.8.1-arm-linux) sha256=ede48564a9c2e29e003361fd7b0b158b3b85bcbd5a15b963fa2b3c78eef3993f
-  commonmarker (2.8.1-arm64-darwin) sha256=cf75760122d6e1c3f8626b5a6911636d2e0aaa26fa8dd377fea440a49c854b3e
-  commonmarker (2.8.1-x86_64-darwin) sha256=75afa559c1f1cc201afbb81291a2f2fc77b2941347deaa8d564d008ba04ecb18
-  commonmarker (2.8.1-x86_64-linux) sha256=c8f2e903c6ee4e2c7e280aa8b49ef37c53202d388e3a2ee06dfdccc8c6fb634f
-  commonmarker (2.8.1-x86_64-linux-musl) sha256=9b6305ce47e0d444b77dabf1762bf76085c2f7963b63c25c02ec36edcf06c785
+  commonmarker (2.8.2-aarch64-linux) sha256=715a5df28e5c1ec7b520e6441466062e9717b82193d2a5bd11a9c94f2f1e15f0
+  commonmarker (2.8.2-aarch64-linux-musl) sha256=c7d587bd7978416978e84d0de7488906b8f29b3f67ce8424942f0ca9aa6899db
+  commonmarker (2.8.2-arm-linux) sha256=da9da5c08d5133ad429ece13f2e93d3a30e1b23621ffac9040e185d7ea29bde6
+  commonmarker (2.8.2-arm64-darwin) sha256=cd7364f1fb9735d60218e4af0a4afbbeedbc465eb81cccca56f29a4efe2b5013
+  commonmarker (2.8.2-x86_64-darwin) sha256=fb946e0bb01f0e5742aef75cc972b51ffe099e5b983ce9cd792b4a78c5d2c297
+  commonmarker (2.8.2-x86_64-linux) sha256=42cfb6532b15dd5821ce99e47397923255f32dcfc81024ef4c17e01e66ac7d75
+  commonmarker (2.8.2-x86_64-linux-musl) sha256=66568dce1c6f265e85d57ea7f749a148446527c7dd599c6ded4cdc819997c43e
   compare-xml (0.66) sha256=e21aa5c0f69ef1177eced997c688fd4df989084e74a1b612257af32e1dd05319
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
@@ -1881,11 +1879,11 @@ CHECKSUMS
   counter_culture (3.13.1) sha256=c297961933d9a9b96683fc298d68fde44039eca7c5876a2b05c3b180fe1c6328
   crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
   crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
-  css_parser (2.1.0) sha256=bfb7c9cf3896426b53337e34b4ad391c3cfe8c2f2c839e72f2cdccf615fb5247
+  css_parser (2.2.0) sha256=23d1b247d7bc78cb2f2fe54629fb755e68d3004f1d1bd5c66d5096d42bff6325
   csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
   cuprite (0.17) sha256=b140d5dc70d08b97ad54bcf45cd95d0bd430e291e9dffe76fff851fddd57c12b
   daemons (1.4.1) sha256=8fc76d76faec669feb5e455d72f35bd4c46dc6735e28c420afb822fac1fa9a1d
-  dalli (5.0.2) sha256=818469227b9acdd9da3fc65ec5ae75d4020115545879e5e8f95634085e9a8749
+  dalli (5.0.4) sha256=3b258f100b8e3acd128a095fbd090c5a1324a6f5238fd1f86a2547473e6d49fc
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
   date_validator (0.12.0) sha256=68c9834da240347b9c17441c553a183572508617ebfbe8c020020f3192ce3058
   deckar01-task_list (2.3.4) sha256=66abdc7e009ea759732bb53867e1ea42de550e2aa03ac30a015cbf42a04c1667
@@ -1898,8 +1896,7 @@ CHECKSUMS
   dotenv (3.2.0) sha256=e375b83121ea7ca4ce20f214740076129ab8514cd81378161f11c03853fe619d
   dotenv-rails (3.2.0) sha256=657e25554ba622ffc95d8c4f1670286510f47f2edda9f68293c3f661b303beab
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
-  dry-configurable (1.3.0) sha256=882d862858567fc1210d2549d4c090f34370fc1bb7c5c1933de3fe792e18afa8
-  dry-container (0.11.0) sha256=23be9381644d47343f3bf13b082b4255994ada0bfd88e0737eaaadc99d035229
+  dry-configurable (1.4.0) sha256=e35d1b5f3c081753ef361f564919db79000f32cfa6f20ee3a3ba5921b41b73ce
   dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1
   dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc
   dry-initializer (3.2.0) sha256=37d59798f912dc0a1efe14a4db4a9306989007b302dcd5f25d0a2a20c166c4e3
@@ -1923,9 +1920,9 @@ CHECKSUMS
   eventmachine (1.2.7) sha256=994016e42aa041477ba9cff45cbe50de2047f25dd418eba003e84f0d16560972
   eventmachine_httpserver (0.2.1) sha256=5db5e8a23754204d43592e5fcc2160457c57c870babe6307c4e61fc95019b809
   excon (1.4.2) sha256=32d8d8eda619717d9b8043b4675e096fb5c2139b080e2ad3b267f88c545aaa35
-  factory_bot (6.5.6) sha256=12beb373214dccc086a7a63763d6718c49769d5606f0501e0a4442676917e077
+  factory_bot (6.6.0) sha256=1fc1b3b5620ec980a6a27aec1b6ec8c250ca82962e970e8a40f93e8d388d4b89
   factory_bot_rails (6.5.1) sha256=d3cc4851eae4dea8a665ec4a4516895045e710554d2b5ac9e68b94d351bc6d68
-  faraday (2.14.1) sha256=a43cceedc1e39d188f4d2cdd360a8aaa6a11da0c407052e426ba8d3fb42ef61c
+  faraday (2.14.2) sha256=73ccb9994a9e8648f010e32eca2ae82e41c57860aa10932cda29418b9e0223ad
   faraday-follow_redirects (0.5.0) sha256=5cde93c894b30943a5d2b93c2fe9284216a6b756f7af406a1e55f211d97d10ad
   faraday-net_http (3.4.2) sha256=f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c
   ferrum (0.17.2) sha256=2c2540a850b211a46f4d81de21bfd62048f507e4c327d1807225c3823c17e6ee
@@ -1943,7 +1940,7 @@ CHECKSUMS
   fog-json (1.3.0) sha256=8c2e4feb221c14f92ceeffb0aa5c8b6e8dd7c614a9141dfe7905f2dffebea217
   fog-xml (0.1.5) sha256=52b9fea10701461dd3eaf9d9839702169b418dbbf50426786b9b74fade373bd6
   formatador (1.2.3) sha256=19fa898133c2c26cdbb5d09f6998c1e137ad9427a046663e55adfe18b950d894
-  friendly_id (5.6.0) sha256=28e221cd53fbd21586321164c1c6fd0c9ba8dde13969cb2363679f44726bb0c3
+  friendly_id (5.7.0) sha256=b8994416ebaceebc7c60bc556e84ef32a3a663e2e582eb04c429216cc98de4c4
   front_matter_parser (1.0.1) sha256=bae298bda01db95788a4d6452f1670a3d198c6716c8d3727db9a95533deb7b7b
   fugit (1.12.1) sha256=5898f478ede9b415f0804e42b8f3fd53f814bd85eebffceebdbc34e1107aaf68
   fuubar (2.5.1) sha256=b272a7804b282661c7fab583a3764f92543cb482c365ae39c685cd218fdd4880
@@ -1951,7 +1948,7 @@ CHECKSUMS
   globalid (1.3.0) sha256=05c639ad6eb4594522a0b07983022f04aa7254626ab69445a0e493aa3786ff11
   good_job (4.18.2) sha256=7e557a15865fc7b7ad4ab71644cf1d4189a2a1869d3b381e5e88741c540beca6
   google-apis-core (1.0.2) sha256=ba4579aaadc902d6cc7bc8db88f566ab00f5e31ea87ab41e9f9a032c470f2629
-  google-apis-gmail_v1 (0.48.0) sha256=561534bb3d93610032720d0459153c432dc8e47e7096a1250fbe0ee8dcc6540c
+  google-apis-gmail_v1 (0.49.0) sha256=f5b5e597c8018d9e4b8df37fb06a8df429bd2de5f0fc94fb21a4d32b139f6ff1
   google-cloud-env (2.3.1) sha256=0faac01eb27be78c2591d64433663b1a114f8f7af55a4f819755426cac9178e7
   google-logging-utils (0.2.0) sha256=675462b4ea5affa825a3442694ca2d75d0069455a1d0956127207498fca3df7b
   google-protobuf (4.34.1) sha256=347181542b8d659c60f028fa3791c9cccce651a91ad27782dbc5c5e374796cdc
@@ -1978,11 +1975,11 @@ CHECKSUMS
   htmlentities (4.3.4) sha256=125a73c6c9f2d1b62100b7c3c401e3624441b663762afa7fe428476435a673da
   http-2 (1.1.3) sha256=1b2f379d35a11dbae94f8a1a52c053d8c161eb4a0c98b5d1605ff1b2bf171c9c
   http_parser.rb (0.8.1) sha256=9ae8df145b39aa5398b2f90090d651c67bd8e2ebfe4507c966579f641e11097a
-  httpx (1.7.6) sha256=82d825abc9876a132adc3492c56a0c528478ac238dd6f74d3422ab0036c6b5c8
+  httpx (1.7.8) sha256=6d769465ed608287a272ba0e4700fc22cee6f0335d80bd5c2effaf7fb7bd2a3a
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   i18n-js (4.2.4) sha256=61390d372f8fa68c495c5907d577657e8cc3a7031f4945db1e91f935e1391355
   i18n-tasks (1.1.2) sha256=4dcfba49e52a623f30661cb316cb80d84fbba5cb8c6d88ef5e02545fffa3637a
-  icalendar (2.12.2) sha256=b63dfb784b4d1214bceaec40097e61eaf78c8691929d7f217779956d9019d9f5
+  icalendar (2.12.3) sha256=37dea76c36f5b21dd745bcd3cb53e7bacfbb4ad0a8d9c2a1c0aa9d39af83c850
   ice_cube (0.17.0) sha256=32deb45dda4b4acc53505c2f581f6d32b5afc04d29b9004769944a0df5a5fcbe
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   image_processing (1.14.0) sha256=754cc169c9c262980889bec6bfd325ed1dafad34f85242b5a07b60af004742fb
@@ -1992,13 +1989,13 @@ CHECKSUMS
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
   jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
-  job-iteration (1.13.1) sha256=af4d5ac624c35ed2f32ed78de92d4673f0a93212105b96d46877b8422e3ff5a3
+  job-iteration (1.14.0) sha256=f154f978109acc838c0359ecde2fdd4dccc3382f95a22e03a58ac561a3615224
   json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
   json-jwt (1.17.0) sha256=6ff99026b4c54281a9431179f76ceb81faa14772d710ef6169785199caadc4cc
   json-schema (6.2.0) sha256=e8bff46ed845a22c1ab2bd0d7eccf831c01fe23bb3920caa4c74db4306813666
   json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
   json_spec (1.1.5) sha256=7a77b97a92c787e2aa3fbc4a1239afc3342c781151dc98cfb81461b3b7cad10f
-  jwt (3.1.2) sha256=af6991f19a6bb4060d618d9add7a66f0eeb005ac0bc017cd01f63b42e122d535
+  jwt (3.2.0) sha256=5419b1fe37b1da0982bd07051f573a8b8789ab724c2aa7e785e4784a3ed217d7
   ladle (1.0.1) sha256=e8586964108c798d48bf57d2a65bd5602e8e5223a176b6602a0fb36c0bda90dc
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   launchy (3.1.1) sha256=72b847b5cc961589dde2c395af0108c86ff0119f42d4648d25b5440ebb10059e
@@ -2045,7 +2042,7 @@ CHECKSUMS
   nokogiri (1.19.3-x86_64-darwin) sha256=77f3fba57d46c53ab31e62fc6c28f705109d1bf6264356c76f132b2be5728d4d
   nokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976
   nokogiri (1.19.3-x86_64-linux-musl) sha256=248c906d2166eca5efb56d52fdee5f9a1f51d69a72e2b64fdac647b4ce39ea3f
-  oj (3.17.0) sha256=5684b2127fb70e650fae90df521b91336ff8e55e2e1011ed80eb0283beac5360
+  oj (3.17.1) sha256=b00687f10bf68a32bfb633b87624174faf0989a5c96aff2f3f96f992717ce782
   okcomputer (1.19.1) sha256=7df770e768434816d228407f0786563827cbf34cb379933578829720cb4f1e77
   omniauth (1.9.2)
   omniauth-openid-connect (0.5.0)
@@ -2082,11 +2079,11 @@ CHECKSUMS
   openproject-webhooks (1.0.0)
   openproject-wikis (1.0.0)
   openproject-xls_export (1.0.0)
-  openssl (4.0.1) sha256=e27974136b7b02894a1bce46c5397ee889afafe704a839446b54dc81cb9c5f7d
+  openssl (4.0.2) sha256=1037ad2868ae58df9ad917891c0c0f9815a1172f6846d4bcdd508e4c2ee747c2
   openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80
-  opentelemetry-api (1.9.0) sha256=d24065dd26583babd8d498d38ea35f74dfa193fb7102512e6e161649440079fb
-  opentelemetry-common (0.24.0) sha256=f1647b233b8ac667feeb74d66a65b702008d9ab55aae825c220b4fe2c14fa773
-  opentelemetry-exporter-otlp (0.33.0) sha256=6e9ce38e393c7eb9aea3fb57b128174a0066767bf495f4fd9e63d7607e0b2ad3
+  opentelemetry-api (1.10.0) sha256=99ee7c829b18381c31a817ee9bf6a160d737542d99cb8da55d443336d266bfa9
+  opentelemetry-common (0.25.0) sha256=73915362e58d337fc92acbe1abfdaee1f725442527125fdb2af1420417f1149d
+  opentelemetry-exporter-otlp (0.34.0) sha256=3b3cdf4329ba30f4389d849c7f13b8f9f983ecb4a030031c03997dffae1e2a60
   opentelemetry-helpers-mysql (0.6.0) sha256=7eeb5e6950c434775a8cf28b5fde4defc12e8b865c86479ce3119fcf593d9337
   opentelemetry-helpers-sql (0.4.0) sha256=b10e8c3a2cca28a98af951bbb3e4efdc59e68b25ba0825e055574af543420afb
   opentelemetry-helpers-sql-processor (0.5.0) sha256=b199241bc9451fcbd9f00b2f454830af19d4ca27c2219ea379c9b0d53cd0e0f1
@@ -2136,15 +2133,15 @@ CHECKSUMS
   opentelemetry-instrumentation-sidekiq (0.29.0) sha256=b1d2a0cb9041a5e14239fe7c94d99e3dd07f870e2759460ab63592d7cdd8aadc
   opentelemetry-instrumentation-sinatra (0.30.0) sha256=b67301153420f43264a0c68cdb3ca5bd77467cf5054e57b83a2bf891aaaa0361
   opentelemetry-instrumentation-trilogy (0.68.0) sha256=24b31efdf21a08644ad26038b574f4b0876195b1502f3f64b1065eff3fe0f588
-  opentelemetry-registry (0.5.0) sha256=726ca58ada93a23efaa5f7bb81b8ab7a8a1e14602935c9c65dfa2e597a19fb4f
-  opentelemetry-sdk (1.11.0) sha256=427c6708f4732105ffa46c11afecb91807085c59e92538eaa6cf46b97b1850c6
-  opentelemetry-semantic_conventions (1.37.0) sha256=1e2dc5ad649e19ba2fb0fa7c6f9303e5cdd8d3952511415cb07efe28a0f8f4c3
+  opentelemetry-registry (0.6.0) sha256=5d3ed32ab9eee0fbdb30d4f0d0bb61ad11a4040b267b475ae815b80a8498a728
+  opentelemetry-sdk (1.12.0) sha256=a224abe0c59023d41cb7ac1c634d9d28843907efcd045ed1ae320796c48b864b
+  opentelemetry-semantic_conventions (1.37.1) sha256=74e87b31ab88c38410c5447d3bc5e692dcc0a73ee2114910c0142fc4546531c1
   optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
   os (1.1.4) sha256=57816d6a334e7bd6aed048f4b0308226c5fb027433b67d90a9ab435f35108d3f
   ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
   overviews (1.0.0)
-  ox (2.14.25) sha256=c938bcfce4d8ff2bd2bdbffe1277222a76c0a6e62078d6854bd4d40f34f2f7db
-  pagy (43.5.3) sha256=f9d73e690648d484706661dcb815647775cf8330fcc5c6e62ec87b9df431290b
+  ox (2.14.26) sha256=d4a9cb49fb55751631d469623cfb2e7dad7cea89119c93749c1e31a3fb2f4896
+  pagy (43.5.4) sha256=2bdf3fa6b1e0cac5bbafe5d077fb24eb971f72f3194f8c6863a0f3867261ce59
   paper_trail (17.0.0) sha256=1c2842061d3874ca7015908e821e2aa14f9b982af2acb2a7974713bf79021c85
   parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
   parallel_tests (5.7.0) sha256=3f1762c46ca2c223b8af8ef877217f9d76974e191bfa934f2580b58bcf1d005c
@@ -2179,7 +2176,7 @@ CHECKSUMS
   psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
   public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
   puffing-billy (4.0.4) sha256=87015b0c41e0722b2171a0c5aa8130fd3f58aa1c016a1dc6dc569b2028aa846f
-  puma (8.0.0) sha256=1681050b8b60fab1d3033255ab58b6aec64cd063e43fc6f8204bcb8bf9364b88
+  puma (8.0.1) sha256=7b94e50c07655718c1fb8ae41a11fc06c7d61293208b3aa608ff71a46d3ad37c
   puma-plugin-statsd (2.8.0) sha256=e515445f93232b6b3571a23b832f93a776d4ce0fc8a5edee798013b82f3488f3
   raabro (1.4.0) sha256=d4fa9ff5172391edb92b242eed8be802d1934b1464061ae5e70d80962c5da882
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
@@ -2205,14 +2202,14 @@ CHECKSUMS
   rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023
   rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe
   rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e
-  rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847
+  rb_sys (0.9.128) sha256=9ab81f4d6d4e1895de18762232362d1264475aa7035756b50441e442130538fd
   rbtrace (0.5.3) sha256=c432292f305d9ab12fd47d9722e0d5210d983758a951fe6107c36cc955cb923f
   rbtree3 (0.7.1) sha256=ab60ead728a5491b70df4f4065e180b18dbab5319f817ce1dbf5dd906f26d8ba
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
   recaptcha (5.21.2) sha256=8f7bb6cc9f04c523fff3f38126b7c5f1314c35fcb3691fc8e70d2b464533c12a
   redcarpet (3.6.1) sha256=d444910e6aa55480c6bcdc0cdb057626e8a32c054c29e793fa642ba2f155f445
   redis (5.4.1) sha256=b5e675b57ad22b15c9bcc765d5ac26f60b675408af916d31527af9bd5a81faae
-  redis-client (0.28.0) sha256=888892f9cd8787a41c0ece00bdf5f556dfff7770326ce40bb2bc11f1bfec824b
+  redis-client (0.29.0) sha256=0c65bf1f8f6dca22063ddb085c0bb2054feef6f03a84869f4161b18a9a15bea3
   regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
   representable (3.2.0) sha256=cc29bf7eebc31653586849371a43ffe36c60b54b0a6365b5f7d95ec34d1ebace
@@ -2232,13 +2229,13 @@ CHECKSUMS
   rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec-wait (1.0.2) sha256=865f921239325d3d26fc10ded4bdd485d8b58bcaaad1a28dd85ed15266b5a912
-  rubocop (1.86.1) sha256=44415f3f01d01a21e01132248d2fd0867572475b566ca188a0a42133a08d4531
+  rubocop (1.86.2) sha256=bb2e97f635eda42c448f2588f4a6ff78f221b8bdfdf65b1e9b07fbd57521b45d
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-capybara (2.23.0) sha256=f9ea1ba3a7561ee8e88cf76fc378ce517ce5327155f305ee7b5c2500e5aee357
   rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb
   rubocop-openproject (0.4.0) sha256=ce56d9e591f9be5a4d98125b10a73564b0557a5e408f97918f9630fb15ae66ae
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
-  rubocop-rails (2.34.3) sha256=10d37989024865ecda8199f311f3faca990143fbac967de943f88aca11eb9ad2
+  rubocop-rails (2.35.1) sha256=4ad270f5fb968ce86ac19f53c4b97354e4f91bc5334177478238674f51568377
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
   ruby-duration (3.2.3) sha256=eb3d13b1df85067a015a8fb2ed8f1eec842a3b721e47c9b6fd74d2f356069784
@@ -2255,8 +2252,8 @@ CHECKSUMS
   sanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984
   scimitar (2.15.0) sha256=700901afab9303b705a8f37644cd733ee3c3819b168d24a14a48dec060b16d63
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
-  selenium-devtools (0.147.0) sha256=8e9262c7c3bfafc7e16b773047912fb952e7bb59c2e6b592ea74a781700d6873
-  selenium-webdriver (4.43.0) sha256=a634377b964b701c6ac0a009ce3a08fa34ec1e1e7fe9a6d57e3088d14529a65c
+  selenium-devtools (0.148.0) sha256=3758305cf150b2abbb074085712808395e4369171f775f5c87fc0b9b1d03cf3f
+  selenium-webdriver (4.44.0) sha256=6f1df072529af369589c46f0e01132952aabb250cfd683c274d74dc1eb5d8477
   semantic (1.6.1) sha256=3cdbb48f59198ebb782a3fdfb87b559e0822a311610db153bae22777a7d0c163
   shoulda-context (2.0.0) sha256=7adf45342cd800f507d2a053658cb1cce2884b616b26004d39684b912ea32c34
   shoulda-matchers (7.0.1) sha256=b4bfd8744c10e0a36c8ac1a687f921ee7e25ed529e50488d61b79a8688749c77
@@ -2264,7 +2261,7 @@ CHECKSUMS
   simpleidn (0.2.3) sha256=08ce96f03fa1605286be22651ba0fc9c0b2d6272c9b27a260bc88be05b0d2c29
   smart_properties (1.17.0) sha256=f9323f8122e932341756ddec8e0ac9ec6e238408a7661508be99439ca6d6384b
   spreadsheet (1.3.5) sha256=cd83ea66803d9cae4ac258dfe16cd8c2b85da33eec18a6d7b48fd4a45840ab7d
-  spring (4.4.2) sha256=22f61bacd8dc8595cedcdc738de46d7fc18be4d7a770986760344c924f485ce7
+  spring (4.5.0) sha256=9124b954f6d079cb9aa610d7069cbada7c146c9368599557806a9ff7067b2e1b
   spring-commands-rspec (1.0.4) sha256=6202e54fa4767452e3641461a83347645af478bf45dddcca9737b43af0dd1a2c
   spring-commands-rubocop (0.4.0) sha256=3e677a2c8a27ae8a986f04bfb69e66d5d55b017541e8be93bf0dc48a7f5690c1
   sprockets (3.7.5) sha256=72c20f256548f8a37fe7db41d96be86c3262fddaf4ebe9d69ec8317394fed383
@@ -2304,8 +2301,8 @@ CHECKSUMS
   validate_email (0.1.6) sha256=9dfe9016d527b17a8d3a6e95e4dc50a125400eef899d13d4cc2a254393f82ee4
   validate_url (1.0.15) sha256=72fe164c0713d63a9970bd6700bea948babbfbdcec392f2342b6704042f57451
   vcr (6.4.0) sha256=077ac92cc16efc5904eb90492a18153b5e6ca5398046d8a249a7c96a9ea24ae6
-  vernier (1.10.0) sha256=5b1dc57012e08ed23e14f4d2943540140d454aa8434c7c35e7eb97befd4969bf
-  view_component (4.9.0) sha256=f599f0831ed0148bb19625f914c43cc982746a2252b6ebe8492bd4eea0d7dbaf
+  vernier (1.10.1) sha256=f2ab2e163b75ac3ef4e3173262d27d27da6219cf04b1b4a7171e4798114275ce
+  view_component (4.10.0) sha256=9e86960ee7ea4da3d1d07f65b1a66e4a9fb656be5434f1a649eb6fce6ac9baf9
   virtus (2.0.0) sha256=8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2
   warden (1.2.9) sha256=46684f885d35a69dbb883deabf85a222c8e427a957804719e143005df7a1efd0
   warden-basic_auth (0.2.1) sha256=bfc752e0109c0182c3e69e930284c5e1e81e7b4a354aeb2b5914ead1391f3c6e
diff --git a/app/components/_index.sass b/app/components/_index.sass
index cd21a4285f8..db76bc961b5 100644
--- a/app/components/_index.sass
+++ b/app/components/_index.sass
@@ -1,5 +1,6 @@
 @import "enterprise_edition/banner_component"
 @import "filter/filters_component"
+@import "open_project/common/border_box_list_component"
 @import "op_primer/border_box_table_component"
 @import "op_primer/full_page_prompt_component"
 @import "op_primer/form_helpers"
@@ -11,8 +12,6 @@
 @import "open_project/common/inplace_edit_fields/index"
 @import "open_project/common/submenu_component"
 @import "open_project/common/main_menu_toggle_component"
-@import "open_project/common/work_package_card_list_component"
-@import "open_project/common/work_package_card_list_component/header"
 @import "open_project/common/work_package_card_component"
 @import "portfolios/details_component"
 @import "projects/row_component"
diff --git a/app/components/open_project/common/work_package_card_list_component.html.erb b/app/components/open_project/common/border_box_list_component.html.erb
similarity index 89%
rename from app/components/open_project/common/work_package_card_list_component.html.erb
rename to app/components/open_project/common/border_box_list_component.html.erb
index 7aa5bdb62fe..416d6220be8 100644
--- a/app/components/open_project/common/work_package_card_list_component.html.erb
+++ b/app/components/open_project/common/border_box_list_component.html.erb
@@ -29,25 +29,25 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= render(Primer::Beta::BorderBox.new(**@system_arguments)) do |border_box| %>
   <% if header? %>
-    <% border_box.with_header(id: header_id) do %>
+    <% border_box.with_header(**header.row_args) do %>
       <%= header %>
     <% end %>
   <% end %>
 
-  <% if items.empty? %>
-    <% border_box.with_row(data: { empty_list_item: true }) do %>
-      <%= empty_state %>
-    <% end %>
-  <% else %>
+  <% if items.any? %>
     <% items.each do |item| %>
       <% border_box.with_row(**item.row_args) do %>
-        <%= render(item.card) %>
+        <%= item %>
       <% end %>
     <% end %>
+  <% elsif empty_state? %>
+    <% border_box.with_row(data: { empty_list_item: true }) do %>
+      <%= empty_state %>
+    <% end %>
   <% end %>
 
   <% if footer? %>
-    <% border_box.with_row(scheme: :neutral) do %>
+    <% border_box.with_footer(**footer.footer_args) do %>
       <%= footer %>
     <% end %>
   <% end %>
diff --git a/app/components/open_project/common/border_box_list_component.rb b/app/components/open_project/common/border_box_list_component.rb
new file mode 100644
index 00000000000..777263a6da1
--- /dev/null
+++ b/app/components/open_project/common/border_box_list_component.rb
@@ -0,0 +1,225 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module OpenProject
+  module Common
+    # A Primer BorderBox-backed list composition with optional header, items,
+    # empty state, and footer.
+    #
+    # Use this component for compact lists that need consistent OpenProject
+    # header actions, collapsible behavior, and row rendering.
+    class BorderBoxListComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
+
+      attr_reader :container, :collapsible, :current_user, :header_id, :footer_id
+
+      alias_method :collapsible?, :collapsible
+
+      # Optional header row.
+      #
+      # @!parse
+      #   # Adds the optional header row.
+      #   #
+      #   # @param system_arguments [Hash] forwarded to {Header}. List wiring
+      #   #   arguments are supplied internally.
+      #   # @return [ViewComponent::Slot]
+      #   def with_header(**system_arguments, &block)
+      #   end
+      renders_one :header, ->(**system_arguments) {
+        system_arguments = system_arguments.except(:id, :list_id)
+        system_arguments[:id] = header_id
+        system_arguments[:list_id] = list_id
+        system_arguments[:interactive] = interactive?
+        system_arguments[:collapsible] = collapsible?
+
+        Header.new(**system_arguments)
+      }
+
+      # List row content.
+      #
+      # Use:
+      #
+      # - `item` for generic row content.
+      # - `work_package_item` for rows backed by a work package card.
+      #
+      # @!parse
+      #   # Adds a generic list row.
+      #   #
+      #   # @param system_arguments [Hash] forwarded to Primer's BorderBox row.
+      #   # @return [ViewComponent::Slot]
+      #   def with_item(**system_arguments, &block)
+      #   end
+      #
+      #   # Adds a work-package list row.
+      #   #
+      #   # @param work_package [WorkPackage] work package rendered by the row.
+      #   # @param project [Project] project context for the work package.
+      #   # @param params [Hash] request params used by specialized item classes.
+      #   # @param component_klass [Class] item component class to instantiate.
+      #   #   Custom classes must accept `work_package:`, `project:`, `params:`,
+      #   #   `container:`, `current_user:`, and any forwarded item arguments.
+      #   # @param item_arguments [Hash] forwarded to the item component.
+      #   # @return [ViewComponent::Slot]
+      #   def with_work_package_item(
+      #     work_package:,
+      #     project: work_package.project,
+      #     params: {},
+      #     component_klass: WorkPackageItem,
+      #     **item_arguments,
+      #     &block
+      #   )
+      #   end
+      renders_many :items, types: {
+        item: {
+          renders: ->(**system_arguments) {
+            Item.new(**system_arguments)
+          },
+          as: :item
+        },
+        work_package_item: {
+          renders: ->(
+            work_package:,
+            project: work_package.project,
+            params: {},
+            component_klass: WorkPackageItem,
+            **item_arguments
+          ) {
+            component_klass.new(
+              work_package:,
+              project:,
+              params:,
+              container:,
+              current_user:,
+              **item_arguments
+            )
+          },
+          as: :work_package_item
+        }
+      }
+
+      # Optional empty-state content rendered when no items are present.
+      #
+      # @!parse
+      #   # Adds empty-state content.
+      #   #
+      #   # Interactive lists announce this empty state only when the slot is
+      #   # configured explicitly.
+      #   #
+      #   # @param title [String] empty-state title.
+      #   # @param description [String, nil] optional supporting text.
+      #   # @param icon [Symbol, nil] optional Primer icon.
+      #   # @param system_arguments [Hash] forwarded to `Primer::Beta::Blankslate`.
+      #   # @return [ViewComponent::Slot]
+      #   def with_empty_state(title:, description: nil, icon: nil, **system_arguments)
+      #   end
+      renders_one :empty_state, ->(title:, description: nil, icon: nil, **system_arguments) {
+        EmptyState.new(title:, description:, icon:, interactive: interactive?, **system_arguments)
+      }
+
+      # Optional footer row.
+      #
+      # @!parse
+      #   # Adds an optional footer row.
+      #   #
+      #   # @param system_arguments [Hash] forwarded to Primer's BorderBox
+      #   #   footer. The `id` is generated internally for collapsible header
+      #   #   wiring.
+      #   # @return [ViewComponent::Slot]
+      #   def with_footer(**system_arguments, &block)
+      #   end
+      renders_one :footer, ->(**system_arguments) {
+        system_arguments = system_arguments.except(:id)
+        system_arguments[:id] = footer_id
+
+        Footer.new(**system_arguments)
+      }
+
+      # @param container [String, Symbol, Class, Object] value passed to
+      #   `dom_target` to derive DOM ids for the list and related controls.
+      # @param interactive [Boolean] whether dynamic list updates should be
+      #   announced politely to assistive technology. This affects the counter
+      #   and an explicitly configured empty state; it does not create default
+      #   empty-state content for manually composed lists.
+      # @param collapsible [Boolean] whether the header renders a collapsible
+      #   toggle. Defaults to `false`.
+      # @param current_user [User] user context passed to work-package items.
+      # @param system_arguments [Hash] forwarded to `Primer::Beta::BorderBox`.
+      #   Pass `id:` to set the box id; related ids are derived from it.
+      def initialize(
+        container:,
+        interactive: false,
+        collapsible: false,
+        current_user: User.current,
+        **system_arguments
+      )
+        super()
+
+        @container = container
+        @interactive = interactive
+        @collapsible = collapsible
+        @current_user = current_user
+        @system_arguments = system_arguments.except(:list_id)
+
+        @system_arguments[:id] ||= dom_target(container)
+        @system_arguments[:list_id] = dom_target(@system_arguments[:id], :list)
+        @header_id = dom_target(@system_arguments[:id], :header)
+        @footer_id = dom_target(@system_arguments[:id], :footer)
+      end
+
+      def before_render
+        content
+        configure_header!
+      end
+
+      def render?
+        header? || items.any? || empty_state? || footer?
+      end
+
+      private
+
+      def interactive?
+        @interactive == true
+      end
+
+      def configure_header!
+        return unless header?
+
+        header.resolve_count!(items.size)
+        return unless collapsible? && footer?
+
+        header.collapsible_id = [list_id, footer_id].compact.join(" ")
+      end
+
+      def list_id
+        @system_arguments[:list_id]
+      end
+    end
+  end
+end
diff --git a/app/components/open_project/common/border_box_list_component.sass b/app/components/open_project/common/border_box_list_component.sass
new file mode 100644
index 00000000000..11a8520a032
--- /dev/null
+++ b/app/components/open_project/common/border_box_list_component.sass
@@ -0,0 +1,22 @@
+//-- copyright
+// OpenProject is an open source project management software.
+// Copyright (C) the OpenProject GmbH
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// See COPYRIGHT and LICENSE files for more details.
+//++
+
+.op-border-box-list-header
+  display: grid
+  grid-template-columns: 1fr minmax(5rem, max-content) auto
+  grid-template-areas: "collapsible actions menu"
+  align-items: center
+
+  &--actions,
+  &--menu
+    margin-left: var(--stack-gap-normal)
+    align-self: flex-start
+    // Unfortunately, the invisible button style bites us here again.
+    margin-top: -6px
diff --git a/app/components/open_project/common/border_box_list_component/empty_state.rb b/app/components/open_project/common/border_box_list_component/empty_state.rb
new file mode 100644
index 00000000000..225c08b0d32
--- /dev/null
+++ b/app/components/open_project/common/border_box_list_component/empty_state.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module OpenProject
+  module Common
+    class BorderBoxListComponent
+      # Empty-state content rendered as a Primer Blankslate.
+      #
+      # This component is part of {BorderBoxListComponent} and should not be
+      # used as a standalone component.
+      #
+      class EmptyState < ApplicationComponent
+        include Primer::AttributesHelper
+
+        # @param title [String] empty-state heading.
+        # @param description [String, nil] optional supporting text.
+        # @param icon [Symbol, nil] optional Primer icon.
+        # @param interactive [Boolean] whether empty-state updates should be
+        #   announced politely to assistive technology.
+        # @param system_arguments [Hash] forwarded to `Primer::Beta::Blankslate`.
+        def initialize(title:, description: nil, icon: nil, interactive: false, **system_arguments)
+          super()
+
+          @title = title
+          @description = description
+          @icon = icon
+
+          @system_arguments = system_arguments
+          return unless interactive
+
+          @system_arguments[:role] ||= "status"
+          @system_arguments[:aria] = merge_aria(
+            { aria: { live: "polite" } },
+            @system_arguments
+          )
+        end
+
+        def call
+          blankslate = Primer::Beta::Blankslate.new(**@system_arguments)
+          blankslate.with_heading(tag: :h4).with_content(@title)
+          blankslate.with_description_content(@description) if @description
+          blankslate.with_visual_icon(icon: @icon) if @icon
+
+          render(blankslate)
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/open_project/common/border_box_list_component/footer.rb b/app/components/open_project/common/border_box_list_component/footer.rb
new file mode 100644
index 00000000000..e4912c09551
--- /dev/null
+++ b/app/components/open_project/common/border_box_list_component/footer.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module OpenProject
+  module Common
+    class BorderBoxListComponent
+      # Footer row rendered below list items.
+      #
+      # This component is part of {BorderBoxListComponent} and should not be
+      # used as a standalone component.
+      class Footer < ApplicationComponent
+        attr_reader :id
+
+        # @param system_arguments [Hash] forwarded to Primer's BorderBox footer.
+        def initialize(**system_arguments)
+          super()
+
+          @id = system_arguments[:id]
+          @system_arguments = system_arguments
+        end
+
+        # @return [Hash] arguments forwarded to Primer's BorderBox footer.
+        def footer_args
+          @system_arguments.deep_dup
+        end
+
+        def call
+          content
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/open_project/common/work_package_card_list_component/header.rb b/app/components/open_project/common/border_box_list_component/has_menu.rb
similarity index 58%
rename from app/components/open_project/common/work_package_card_list_component/header.rb
rename to app/components/open_project/common/border_box_list_component/has_menu.rb
index 3bb6f63f823..60beea91b76 100644
--- a/app/components/open_project/common/work_package_card_list_component/header.rb
+++ b/app/components/open_project/common/border_box_list_component/has_menu.rb
@@ -23,55 +23,60 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
 module OpenProject
   module Common
-    class WorkPackageCardListComponent
-      class Header < ApplicationComponent
-        include OpPrimer::ComponentHelpers
+    class BorderBoxListComponent
+      # Adds the standard list action menu slot used by list headers and items.
+      module HasMenu
+        extend ActiveSupport::Concern
+        include Primer::ClassNameHelper
 
-        renders_one :description
-
-        renders_many :actions, types: {
-          button: ->(**system_arguments) do
-            Primer::Beta::Button.new(**system_arguments)
+        included do
+          # @!parse
+          #   # Adds a trailing action menu.
+          #   #
+          #   # @param menu_id [String, nil] id prefix for the Primer action menu.
+          #   # @param button_aria_label [String, nil] accessible label for the
+          #   #   menu button.
+          #   # @param system_arguments [Hash] forwarded to
+          #   #   `Primer::Alpha::ActionMenu`.
+          #   # @return [ViewComponent::Slot]
+          #   def with_menu(menu_id: nil, button_aria_label: nil, **system_arguments, &block)
+          #   end
+          renders_one :menu, ->(menu_id: nil, button_aria_label: nil, **system_arguments) do
+            build_menu(menu_id:, button_aria_label:, **system_arguments)
           end
-        }
+        end
 
-        renders_one :menu, ->(menu_id: nil, button_aria_label: nil, **system_arguments) do
+        private
+
+        def build_menu(menu_id: nil, button_aria_label: nil, **system_arguments)
           system_arguments[:classes] = class_names(
             system_arguments[:classes],
             "hide-when-print"
           )
 
           menu = Primer::Alpha::ActionMenu.new(
-            menu_id: menu_id || dom_target(container, :menu),
+            menu_id: menu_id || default_menu_id,
             anchor_align: :end,
             **system_arguments
           )
           menu.with_show_button(
             scheme: :invisible,
             icon: :"kebab-horizontal",
-            "aria-label": button_aria_label || t(".label_actions"),
+            "aria-label": button_aria_label || I18n.t(:label_actions),
             tooltip_direction: :se
           )
           menu
         end
 
-        attr_reader :title, :container, :list_id, :collapsed, :count
-
-        def initialize(title:, container:, list_id:, collapsed: false, count: nil)
-          super()
-
-          @title = title
-          @container = container
-          @list_id = list_id
-          @collapsed = collapsed
-          @count = count
+        def default_menu_id
+          self.class.generate_id
         end
       end
     end
diff --git a/app/components/open_project/common/border_box_list_component/header.html.erb b/app/components/open_project/common/border_box_list_component/header.html.erb
new file mode 100644
index 00000000000..3ef158da2d2
--- /dev/null
+++ b/app/components/open_project/common/border_box_list_component/header.html.erb
@@ -0,0 +1,82 @@
+<%# -- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++# %>
+
+<%= grid_layout("op-border-box-list-header", tag: :div) do |grid| %>
+    <% grid.with_area(:collapsible) do %>
+      <% if collapsible? %>
+        <%=
+          render(
+            Primer::OpenProject::BorderBox::CollapsibleHeader.new(
+              collapsible_id:,
+              collapsed:,
+              multi_line: true
+            )
+          ) do |collapsible|
+        %>
+          <% collapsible.with_title(tag: title_tag) { title } %>
+          <% if render_count? %>
+            <% collapsible.with_count(**counter_arguments) %>
+          <% end %>
+          <% if description? %>
+            <% collapsible.with_description do %>
+              <%= description %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% else %>
+        <%= render(Primer::BaseComponent.new(tag: :div, classes: "CollapsibleHeader CollapsibleHeader--multi-line")) do %>
+          <%= render(Primer::BaseComponent.new(tag: :div, classes: "CollapsibleHeader-title-line")) do %>
+            <%= render(Primer::Beta::Truncate.new(tag: title_tag, classes: "CollapsibleHeader-title Box-title")) { title } %>
+            <% if render_count? %>
+              <%= render(Primer::Beta::Counter.new(**counter_arguments, classes: class_names(counter_arguments[:classes], "CollapsibleHeader-count"))) %>
+            <% end %>
+          <% end %>
+          <% if description? %>
+            <%= render(Primer::Beta::Text.new(color: :subtle, trim: true, classes: "CollapsibleHeader-description")) do %>
+              <%= description %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <% if actions? %>
+      <% grid.with_area(:actions) do %>
+        <% actions.each do |action| %>
+          <%= action %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <% if menu? %>
+      <% grid.with_area(:menu) do %>
+        <%= menu %>
+      <% end %>
+    <% end %>
+<% end %>
diff --git a/app/components/open_project/common/border_box_list_component/header.rb b/app/components/open_project/common/border_box_list_component/header.rb
new file mode 100644
index 00000000000..db07605194b
--- /dev/null
+++ b/app/components/open_project/common/border_box_list_component/header.rb
@@ -0,0 +1,183 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module OpenProject
+  module Common
+    class BorderBoxListComponent
+      # Structured header for {BorderBoxListComponent}.
+      #
+      # This component is part of {BorderBoxListComponent} and should not be
+      # used as a standalone component.
+      #
+      # The header renders through `Primer::Beta::BorderBox#with_header` and
+      # wraps the supplied title, count, description, actions, and menu in an
+      # `Primer::OpenProject::BorderBox::CollapsibleHeader`.
+      class Header < ApplicationComponent
+        include OpPrimer::ComponentHelpers
+        include Primer::AttributesHelper
+        include HasMenu
+
+        DEFAULT_ACTION_SCHEME = :default
+
+        DEFAULT_COUNT_ARGUMENTS = {
+          scheme: :primary,
+          round: true,
+          limit: 1_000,
+          hide_if_zero: true
+        }.freeze
+
+        # @!parse
+        #   # Adds secondary content below the header title.
+        #   #
+        #   # @return [ViewComponent::Slot]
+        #   def with_description(&block)
+        #   end
+        renders_one :description
+
+        # @!parse
+        #   # Adds a button to the header actions area.
+        #   #
+        #   # @param system_arguments [Hash] forwarded to `Primer::Beta::Button`.
+        #   # @return [ViewComponent::Slot]
+        #   def with_action_button(**system_arguments, &block)
+        #   end
+        renders_many :actions, types: {
+          button: ->(scheme: DEFAULT_ACTION_SCHEME, **system_arguments) do
+            Primer::Beta::Button.new(scheme:, **system_arguments)
+          end
+        }
+
+        attr_reader :title,
+                    :count,
+                    :count_label,
+                    :count_arguments,
+                    :title_tag,
+                    :list_id,
+                    :interactive,
+                    :collapsed,
+                    :collapsible
+
+        attr_writer :collapsible_id
+
+        # @param title [String] header title.
+        # @param count [Integer, Boolean, nil] count badge behavior. Pass
+        #   `nil` or `false` to hide it, `true` to infer the rendered item
+        #   count, or an integer to render an explicit value.
+        # @param count_label [String, nil] accessible label for the counter
+        #   badge. Defaults to `I18n.t(:label_x_items, count:)` when a count
+        #   is rendered. Pass an explicit string to override.
+        # @param count_arguments [Hash] forwarded to `Primer::Beta::Counter`.
+        #   Values are merged over the default counter arguments.
+        # @param title_tag [Symbol] tag used for the title heading.
+        # @param list_id [String, nil] id of the collapsible list body.
+        # @param interactive [Boolean] whether counter updates should be
+        #   announced politely to assistive technology.
+        # @param collapsed [Boolean] whether the collapsible header starts closed.
+        # @param collapsible [Boolean] whether the header renders a collapsible
+        #   toggle. Defaults to `false`. Pass `true` to render a header
+        #   with a toggle button.
+        # @param system_arguments [Hash] forwarded to `Primer::Beta::BorderBox#with_header`.
+        def initialize(
+          title:,
+          count: nil,
+          count_label: nil,
+          count_arguments: {},
+          title_tag: :h4,
+          list_id: nil,
+          interactive: false,
+          collapsed: false,
+          collapsible: false,
+          **system_arguments
+        )
+          super()
+
+          @title = title
+          @count = count
+          @count_label = count_label
+          @count_arguments = count_arguments
+          @title_tag = title_tag
+          @list_id = list_id
+          @interactive = interactive
+          @collapsible_id = list_id
+          @collapsed = collapsed
+          @collapsible = collapsible
+          @system_arguments = system_arguments
+        end
+
+        # @return [Boolean] whether a collapsible toggle should be rendered.
+        def collapsible?
+          collapsible
+        end
+
+        # Resolves inferred counts after the list slots have been captured.
+        #
+        # @param item_count [Integer] number of rendered item slots.
+        # @return [void]
+        def resolve_count!(item_count)
+          @count = item_count if count == true
+          @count_label ||= I18n.t(:label_x_items, count: @count) if render_count?
+        end
+
+        # @return [Hash] arguments forwarded to `Primer::Beta::BorderBox#with_header`.
+        def row_args
+          @system_arguments.deep_dup
+        end
+
+        # @return [Boolean] whether a counter should be rendered.
+        def render_count?
+          !count.nil? && count != false
+        end
+
+        # @return [Hash] merged arguments forwarded to `Primer::Beta::Counter`.
+        def counter_arguments
+          merged = DEFAULT_COUNT_ARGUMENTS.merge(count_arguments).merge(count:)
+          default_aria = { label: count_label }
+          default_aria[:live] = "polite" if interactive
+          merged[:aria] = merge_aria(
+            { aria: default_aria },
+            merged
+          )
+          merged
+        end
+
+        # @return [String, nil] ids controlled by the collapsible header.
+        def collapsible_id
+          @collapsible_id.presence
+        end
+
+        private
+
+        def default_menu_id
+          list_id ? "#{list_id}_menu" : super
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/open_project/common/work_package_card_list_component/content_item.rb b/app/components/open_project/common/border_box_list_component/item.rb
similarity index 82%
rename from app/components/open_project/common/work_package_card_list_component/content_item.rb
rename to app/components/open_project/common/border_box_list_component/item.rb
index a6b27d116d8..dcd8079c7c9 100644
--- a/app/components/open_project/common/work_package_card_list_component/content_item.rb
+++ b/app/components/open_project/common/border_box_list_component/item.rb
@@ -23,32 +23,28 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
 module OpenProject
   module Common
-    class WorkPackageCardListComponent
-      # Item bridge for caller-provided content.
-      class ContentItem < ApplicationComponent
+    class BorderBoxListComponent
+      # Generic BorderBox list row that renders the slot content directly.
+      class Item < ApplicationComponent
+        # @param system_arguments [Hash] forwarded to Primer's BorderBox row.
         def initialize(**system_arguments)
           super()
 
           @system_arguments = system_arguments
         end
 
+        # @return [Hash] arguments forwarded to Primer's BorderBox row.
         def row_args
           @system_arguments.deep_dup
         end
 
-        def card
-          self
-        end
-
-        def empty_item? = false
-
         def call
           content
         end
diff --git a/app/components/open_project/common/work_package_card_list_component/item.rb b/app/components/open_project/common/border_box_list_component/work_package_item.rb
similarity index 61%
rename from app/components/open_project/common/work_package_card_list_component/item.rb
rename to app/components/open_project/common/border_box_list_component/work_package_item.rb
index ca5c6a66131..32537fd9ca2 100644
--- a/app/components/open_project/common/work_package_card_list_component/item.rb
+++ b/app/components/open_project/common/border_box_list_component/work_package_item.rb
@@ -23,18 +23,19 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
 module OpenProject
   module Common
-    class WorkPackageCardListComponent
-      # Internal row bridge between the card list and the visual card. It owns
-      # the surrounding BorderBox row arguments while `WorkPackageCardComponent`
-      # renders the card body.
-      class Item < ApplicationComponent
+    class BorderBoxListComponent
+      # BorderBox list row that renders a work package card.
+      #
+      # Specialized rows can subclass this component and override `build_card`
+      # to provide a different card component while keeping row behavior.
+      class WorkPackageItem < ApplicationComponent
         include ActionView::RecordIdentifier
         include Primer::ClassNameHelper
         include Primer::AttributesHelper
@@ -45,8 +46,16 @@ module OpenProject
                     :params,
                     :current_user
 
-        delegate :with_metric, to: :card
+        # Delegates card slots so callers can configure the rendered card from
+        # `with_work_package_item`.
+        delegate :with_metric, :with_menu, to: :card
 
+        # @param work_package [WorkPackage] work package rendered by the card.
+        # @param project [Project] project context for row behavior.
+        # @param container [String, Array<String, Symbol>] parent list container id seed.
+        # @param params [Hash] request params used by specialized item classes.
+        # @param current_user [User] user context for specialized item classes.
+        # @param system_arguments [Hash] forwarded to Primer's BorderBox row.
         def initialize(
           work_package:,
           project:,
@@ -65,11 +74,16 @@ module OpenProject
           @system_arguments = system_arguments
         end
 
+        # @return [Hash] arguments forwarded to Primer's BorderBox row.
         def row_args
           row_arguments = @system_arguments.deep_dup
           row_arguments[:id] ||= dom_id(work_package)
           row_arguments[:tabindex] ||= 0
-          row_arguments[:classes] = class_names(row_classes, row_arguments[:classes])
+          row_arguments[:test_selector] ||= "work-package-#{work_package.id}"
+          row_arguments[:classes] = class_names(
+            row_classes,
+            row_arguments[:classes]
+          )
           row_arguments[:data] = merge_data(
             { data: row_data },
             row_arguments
@@ -77,16 +91,28 @@ module OpenProject
           row_arguments
         end
 
-        def card
-          @card ||= WorkPackageCardComponent.new(work_package:)
+        def before_render
+          content
         end
 
-        def render? = false
+        def call
+          render(card)
+        end
 
-        def empty_item? = false
+        # @return [ApplicationComponent] card component rendered inside the row.
+        def card
+          @card ||= build_card
+        end
 
         private
 
+        # Override in subclasses to render a specialized work-package card.
+        #
+        # @return [ApplicationComponent]
+        def build_card
+          WorkPackageCardComponent.new(work_package:)
+        end
+
         def row_classes
           class_names(
             "Box-row--hover-blue",
@@ -97,11 +123,7 @@ module OpenProject
         end
 
         def row_data
-          data = {
-            test_selector: "work-package-#{work_package.id}"
-          }
-
-          draggable? ? data.merge(draggable_data) : data
+          draggable? ? draggable_data : {}
         end
 
         def draggable?
diff --git a/app/components/open_project/common/work_package_card_list_component.rb b/app/components/open_project/common/work_package_card_list_component.rb
deleted file mode 100644
index 0f29b85c268..00000000000
--- a/app/components/open_project/common/work_package_card_list_component.rb
+++ /dev/null
@@ -1,309 +0,0 @@
-# frozen_string_literal: true
-
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-module OpenProject
-  module Common
-    class WorkPackageCardListComponent < ApplicationComponent
-      include Primer::AttributesHelper
-      include OpPrimer::ComponentHelpers
-
-      # Renders a `Header` above the card list with the title, count badge, and
-      # consumer-provided actions/menu/description.
-      #
-      # @param title [String] heading text rendered inside the collapsible header.
-      # @param count [Integer, NilClass] optional count badge displayed alongside
-      #   the title; hidden when zero or nil.
-      renders_one :header, ->(title:, count: nil) {
-        Header.new(title:, count:, container:, list_id:, collapsed: folded?)
-      }
-
-      # Renders a `Primer::Beta::Blankslate` when no items are produced — that
-      # is, when `items.empty?` after slot resolution and automatic item builds.
-      # The slot is required unless the caller provides manual items, and is
-      # silently ignored whenever `items` is non-empty.
-      #
-      # @param title [String] blankslate heading.
-      # @param description [String, NilClass] optional secondary text.
-      # @param icon [Symbol, NilClass] optional Octicon name.
-      # @param system_arguments [Hash] forwarded to `Primer::Beta::Blankslate`.
-      renders_one :empty_state, ->(title:, description: nil, icon: nil, **system_arguments) {
-        system_arguments[:role] = "status"
-        system_arguments[:aria] = merge_aria(
-          system_arguments,
-          aria: { live: "polite" }
-        )
-
-        blankslate = Primer::Beta::Blankslate.new(**system_arguments)
-        blankslate.with_heading(tag: :h4).with_content(title)
-        blankslate.with_description_content(description) if description
-        blankslate.with_visual_icon(icon:) if icon
-        blankslate
-      }
-
-      # @!parse
-      #   # Adds a work package item row to the list. When at least one item
-      #   # is added manually, the list does not build rows from
-      #   # `work_packages:`.
-      #   #
-      #   # @param work_package [WorkPackage] the work package rendered in the row.
-      #   # @param component_klass [Class] row bridge class used instead of the
-      #   #   default item class. Defaults to the list's configured
-      #   #   `item_component_klass`. It must accept the arguments documented on
-      #   #   `#build_item`, expose `#row_args` with valid
-      #   #   `Primer::Beta::BorderBox#with_row` keyword arguments, and expose
-      #   #   `#card` returning a renderable object.
-      #   # @param system_arguments [Hash] forwarded to the item class.
-      #   def with_work_package_item(
-      #     work_package:,
-      #     component_klass: Item,
-      #     **system_arguments,
-      #     &block
-      #   )
-      #   end
-
-      # @!parse
-      #   # Adds a custom empty item row to the list. This can be used instead of
-      #   # the `empty_state` slot when the caller owns item iteration. It cannot
-      #   # be combined with `work_packages:`, `with_work_package_item`, or
-      #   # `with_item`.
-      #   #
-      #   # @param system_arguments [Hash] forwarded to
-      #   #   `Primer::Beta::BorderBox#with_row`.
-      #   def with_empty_item(**system_arguments, &block)
-      #   end
-
-      # @!parse
-      #   # Adds a generic item to the list. When at least one item is added
-      #   # manually, the list does not build rows from `work_packages:`.
-      #   #
-      #   # @param system_arguments [Hash] forwarded to
-      #   #   `Primer::Beta::BorderBox#with_row`.
-      #   def with_item(**system_arguments, &block)
-      #   end
-      renders_many :items, types: {
-        work_package_item: {
-          renders: lambda { |work_package:, **system_arguments, &block|
-            build_item(work_package:, **system_arguments).tap do |item|
-              capture(item, &block) if block
-            end
-          },
-          as: :work_package_item
-        },
-        empty_item: {
-          renders: lambda { |**system_arguments, &block|
-            build_content_item(EmptyItem, **system_arguments, &block)
-          },
-          as: :empty_item
-        },
-        item: {
-          renders: lambda { |**system_arguments, &block|
-            build_content_item(ContentItem, **system_arguments, &block)
-          },
-          as: :item
-        }
-      }
-
-      # Renders a free-form footer row below the card list.
-      renders_one :footer
-
-      attr_reader :work_packages,
-                  :project,
-                  :container,
-                  :drag_and_drop,
-                  :item_component_klass,
-                  :params,
-                  :current_user
-
-      # @param project [Project] the project this card list is rendered in. May
-      #   differ from individual `work_package.project` values when sprints or
-      #   buckets are shared across projects.
-      # @param container [Symbol, String, Class, ApplicationRecord] drives the
-      #   list DOM id and related ids via `dom_target`.
-      # @param work_packages [Enumerable<WorkPackage>] the work packages to render
-      #   as cards.
-      # @param drag_and_drop [Hash, NilClass] optional generic drag-and-drop
-      #   target data. Requires `:target_id` and `:allowed_drag_type` when set.
-      # @param item_component_klass [Class] item class used for automatically
-      #   built work package items.
-      # @param params [Hash] optional URL params passed to work package items
-      #   when deriving row arguments.
-      # @param current_user [User] passed through to each item for permission
-      #   checks; defaults to `User.current`.
-      # @param system_arguments [Hash] forwarded to the underlying
-      #   `Primer::Beta::BorderBox`.
-      def initialize(
-        project:,
-        container:,
-        work_packages: [],
-        drag_and_drop: nil,
-        item_component_klass: Item,
-        params: {},
-        current_user: User.current,
-        **system_arguments
-      )
-        super()
-
-        @work_packages = work_packages
-        @project = project
-        @container = container
-        @drag_and_drop = drag_and_drop
-        @item_component_klass = item_component_klass
-        @params = params
-        @current_user = current_user
-        @automatic_items = false
-
-        @system_arguments = system_arguments
-        @system_arguments[:id] = container_id
-        @system_arguments[:list_id] = list_id
-        @system_arguments[:padding] = :condensed
-        merge_drag_and_drop_data! if drag_and_drop
-      end
-
-      def before_render
-        # Content must be loaded before mode validation and automatic item builds
-        # so slot calls have already populated `items`.
-        content
-        validate_item_mode!
-        build_automatic_items if build_automatic_items?
-        validate_empty_state!
-      end
-
-      # Builds a new work package item without adding it to the list. Use this
-      # instead of the `#with_work_package_item` slot when rendering additional
-      # items outside this list, such as in a separately-loaded page.
-      #
-      # @param work_package [WorkPackage] the work package rendered in the row.
-      # @param component_klass [Class] item class used instead of the configured
-      #   default item class. It must accept `work_package:`, `project:`,
-      #   `container:`, `params:`, `current_user:`, and `**system_arguments`.
-      # @param system_arguments [Hash] forwarded to the item class.
-      def build_item(
-        work_package:,
-        component_klass: item_component_klass,
-        **system_arguments
-      )
-        component_klass.new(
-          work_package:,
-          project:,
-          container:,
-          params:,
-          current_user:,
-          **system_arguments
-        )
-      end
-
-      private
-
-      def folded?
-        current_user.pref[:backlogs_versions_default_fold_state] == "closed"
-      end
-
-      def build_automatic_items?
-        non_empty_items.empty? && work_packages.any?
-      end
-
-      def build_automatic_items
-        @automatic_items = true
-
-        work_packages.each do |work_package|
-          with_work_package_item(work_package:)
-        end
-      end
-
-      def build_content_item(item_class, **system_arguments, &block)
-        item_class.new(**system_arguments).tap do |item|
-          item.with_content(capture(&block)) if block
-        end
-      end
-
-      def automatic_items?
-        @automatic_items
-      end
-
-      def validate_item_mode!
-        return unless empty_items.any?
-
-        if work_packages.any?
-          raise ArgumentError, "empty_item cannot be combined with work_packages"
-        end
-
-        if non_empty_items.any?
-          raise ArgumentError, "empty_item cannot be combined with other items"
-        end
-      end
-
-      def validate_empty_state!
-        return unless items.empty? && !empty_state?
-
-        raise ArgumentError, "empty_state slot is required when no work package items are rendered"
-      end
-
-      def container_id
-        dom_target(container)
-      end
-
-      def list_id
-        dom_target(container, :list)
-      end
-
-      def header_id
-        dom_target(container, :header)
-      end
-
-      def empty_items
-        items.select { |item| item.respond_to?(:empty_item?) && item.empty_item? }
-      end
-
-      def non_empty_items
-        items - empty_items
-      end
-
-      def merge_drag_and_drop_data!
-        @system_arguments[:data] = merge_data(
-          {
-            data: drag_and_drop_data
-          },
-          @system_arguments
-        )
-      end
-
-      def drag_and_drop_data
-        {
-          # Existing callers share one mirror container target on the page until
-          # parent-specific DnD handling is extracted in follow-up work.
-          generic_drag_and_drop_target: "container",
-          target_container_accessor: ":scope > ul",
-          target_id: drag_and_drop.fetch(:target_id),
-          target_allowed_drag_type: drag_and_drop.fetch(:allowed_drag_type)
-        }
-      end
-    end
-  end
-end
diff --git a/app/components/open_project/common/work_package_card_list_component/header.html.erb b/app/components/open_project/common/work_package_card_list_component/header.html.erb
deleted file mode 100644
index d57862a113e..00000000000
--- a/app/components/open_project/common/work_package_card_list_component/header.html.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-<%# -- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++# %>
-
-<%= grid_layout("op-work-package-card-list-header", tag: :div) do |grid| %>
-  <% grid.with_area(:collapsible) do %>
-    <%=
-      render(
-        Primer::OpenProject::BorderBox::CollapsibleHeader.new(
-          collapsible_id: list_id,
-          collapsed:,
-          multi_line: true
-        )
-      ) do |collapsible|
-    %>
-      <% collapsible.with_title(tag: :h4) { title } %>
-      <% if count %>
-        <% collapsible.with_count(
-             scheme: :primary,
-             count: count,
-             round: true,
-             limit: 1_000,
-             hide_if_zero: true,
-             aria: {
-               label: t(".label_work_package_count", count: count),
-               live: "polite"
-             }
-           ) %>
-      <% end %>
-      <% if description? %>
-        <% collapsible.with_description do %>
-          <%= description %>
-        <% end %>
-      <% end %>
-    <% end %>
-  <% end %>
-
-  <% if actions? %>
-    <% grid.with_area(:actions) do %>
-      <% actions.each do |action| %>
-        <%= action %>
-      <% end %>
-    <% end %>
-  <% end %>
-
-  <% grid.with_area(:menu) do %>
-    <%= menu %>
-  <% end %>
-<% end %>
diff --git a/app/components/projects/row_component.rb b/app/components/projects/row_component.rb
index e09c722ee59..8cd0697a812 100644
--- a/app/components/projects/row_component.rb
+++ b/app/components/projects/row_component.rb
@@ -80,26 +80,10 @@ module Projects
       send(column.attribute)
     end
 
-    def custom_field_column(column) # rubocop:disable Metrics/AbcSize
+    def custom_field_column(column)
       return nil unless user_can_view_project_attributes?
 
-      cf = column.custom_field
-      custom_value = project.formatted_custom_value_for(cf)
-
-      if cf.field_format == "text" && custom_value.present?
-        render OpenProject::Common::AttributeComponent.new(
-          "dialog-#{project.id}-cf-#{cf.id}",
-          cf.name,
-          custom_value,
-          format: false # already formatted
-        )
-      elsif custom_value.is_a?(Array)
-        safe_join(Array(custom_value).compact_blank, ", ")
-      elsif cf.calculated_value?
-        render_calculated_value(cf, custom_value)
-      else
-        custom_value
-      end
+      super
     end
 
     def render_calculated_value(custom_field, custom_value)
@@ -451,6 +435,25 @@ module Projects
       User.current.allowed_in_project?(:view_project_phases, project)
     end
 
+    def custom_field_column_subject
+      project
+    end
+
+    def format_custom_field_value(cf, custom_value)
+      if cf.field_format == "text" && custom_value.present?
+        render OpenProject::Common::AttributeComponent.new(
+          "dialog-#{project.id}-cf-#{cf.id}",
+          cf.name,
+          custom_value,
+          format: false
+        )
+      elsif cf.calculated_value?
+        render_calculated_value(cf, custom_value)
+      else
+        super
+      end
+    end
+
     def custom_field_column?(column)
       column.is_a?(::Queries::Projects::Selects::CustomField)
     end
diff --git a/app/components/row_component.rb b/app/components/row_component.rb
index 43f3fcd71e5..00ae80c0993 100644
--- a/app/components/row_component.rb
+++ b/app/components/row_component.rb
@@ -45,9 +45,22 @@ class RowComponent < ApplicationComponent
   end
 
   def column_value(column)
+    return custom_field_column(column) if custom_field_column?(column)
+
     send(column)
   end
 
+  def custom_field_column?(column)
+    column.is_a?(Queries::Selects::Shared::CustomFieldSelect)
+  end
+
+  def custom_field_column(column)
+    cf = column.custom_field
+    return "" unless cf
+
+    format_custom_field_value(cf, custom_field_column_subject.formatted_custom_value_for(cf))
+  end
+
   def column_css_class(column)
     column_css_classes[column]
   end
@@ -81,4 +94,18 @@ class RowComponent < ApplicationComponent
       helpers.op_icon "icon icon-checkmark"
     end
   end
+
+  private
+
+  def custom_field_column_subject
+    model
+  end
+
+  def format_custom_field_value(_cf, custom_value)
+    if custom_value.is_a?(Array)
+      safe_join(Array(custom_value).compact_blank, ", ")
+    else
+      custom_value.to_s
+    end
+  end
 end
diff --git a/app/components/table_component.html.erb b/app/components/table_component.html.erb
index 9e1c00c35b1..17e2a3410b9 100644
--- a/app/components/table_component.html.erb
+++ b/app/components/table_component.html.erb
@@ -26,55 +26,56 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-
-<div class="generic-table--container <%= container_class %>" data-test-selector="<%= test_selector %>" id="<%= container_id %>">
-  <div class="generic-table--results-container">
-    <%= render(Primer::BaseComponent.new(**@system_arguments)) do %>
-      <colgroup>
-        <% headers.each do |_name, _options| %>
-          <col>
-        <% end %>
-        <col data-highlight="false">
-      </colgroup>
-      <thead>
-        <tr>
-          <% headers.each do |name, options| %>
-            <% if sortable_column?(name) %>
-              <%= helpers.sort_header_tag(name, **options) %>
-            <% else %>
-              <th>
-                <div class="generic-table--sort-header-outer">
-                  <div class="generic-table--sort-header">
-                    <span>
-                      <%= options[:caption] %>
-                    </span>
-                  </div>
-                </div>
-              </th>
-            <% end %>
+<%= component_wrapper do %>
+  <div class="generic-table--container <%= container_class %>" data-test-selector="<%= test_selector %>" id="<%= container_id %>">
+    <div class="generic-table--results-container">
+      <%= render(Primer::BaseComponent.new(**@system_arguments)) do %>
+        <colgroup>
+          <% headers.each do |_name, _options| %>
+            <col>
           <% end %>
-          <th>
-            <%# last column for buttons %>
-            <div class="generic-table--empty-header"></div>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <% if rows.empty? %>
-        <tr class="generic-table--empty-row">
-          <td colspan="<%= headers.length + 1 %>"><%= empty_row_message %></td>
-        </tr>
-        <% end %>
-        <%= render_collection rows %>
-      </tbody>
-    <% end %>
-    <% if inline_create_link %>
-      <div class="wp-inline-create-button">
-        <%= inline_create_link %>
-      </div>
-    <% end %>
+          <col data-highlight="false">
+        </colgroup>
+        <thead>
+          <tr>
+            <% headers.each do |name, options| %>
+              <% if sortable_column?(name) %>
+                <%= helpers.sort_header_tag(name, **options) %>
+              <% else %>
+                <th>
+                  <div class="generic-table--sort-header-outer">
+                    <div class="generic-table--sort-header">
+                      <span>
+                        <%= options[:caption] %>
+                      </span>
+                    </div>
+                  </div>
+                </th>
+              <% end %>
+            <% end %>
+            <th>
+              <%# last column for buttons %>
+              <div class="generic-table--empty-header"></div>
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <% if rows.empty? %>
+          <tr class="generic-table--empty-row">
+            <td colspan="<%= headers.length + 1 %>"><%= empty_row_message %></td>
+          </tr>
+          <% end %>
+          <%= render_collection rows %>
+        </tbody>
+      <% end %>
+      <% if inline_create_link %>
+        <div class="wp-inline-create-button">
+          <%= inline_create_link %>
+        </div>
+      <% end %>
+    </div>
   </div>
-</div>
-<% if paginated? %>
-  <%= helpers.pagination_links_full rows %>
+  <% if paginated? %>
+    <%= helpers.pagination_links_full rows %>
+  <% end %>
 <% end %>
diff --git a/app/components/table_component.rb b/app/components/table_component.rb
index efe7f01ebd8..470bafc59c6 100644
--- a/app/components/table_component.rb
+++ b/app/components/table_component.rb
@@ -32,6 +32,7 @@
 # Abstract view component. Subclass this for a concrete table.
 class TableComponent < ApplicationComponent
   include Primer::AttributesHelper
+  include OpTurbo::Streamable
 
   def initialize(rows: [], table_arguments: {}, **)
     super(rows, **)
diff --git a/app/components/users/configure_view_modal_component.html.erb b/app/components/users/configure_view_modal_component.html.erb
new file mode 100644
index 00000000000..068e3cee7eb
--- /dev/null
+++ b/app/components/users/configure_view_modal_component.html.erb
@@ -0,0 +1,27 @@
+<%= render(Primer::Alpha::Dialog.new(title: t(:"queries.configure_view.heading"), size: :large, id: MODAL_ID, style: "min-height: 360px")) do |d| %>
+  <% d.with_header(variant: :large) %>
+  <%= render(Primer::Alpha::Dialog::Body.new) do %>
+    <%= primer_form_with(url: users_path, id: QUERY_FORM_ID, data: { "turbo-stream" => false }, method: :get) do %>
+      <% { filters: params[:filters], sortBy: params[:sortBy] }.each do |name, value| %>
+        <%= hidden_field_tag name, value if value.present? %>
+      <% end %>
+      <%= helpers.angular_component_tag "opce-draggable-autocompleter",
+                                        inputs: {
+                                          options: selectable_columns,
+                                          selected: selected_columns,
+                                          name: COLUMN_HTML_NAME,
+                                          id: COLUMN_HTML_ID,
+                                          dragAreaName: "#{COLUMN_HTML_ID}_dragarea",
+                                          formControlId: "#{COLUMN_HTML_ID}_autocompleter",
+                                          inputLabel: t(:"queries.configure_view.columns.input_label"),
+                                          inputPlaceholder: t(:"queries.configure_view.columns.input_placeholder"),
+                                          dragAreaLabel: t(:"queries.configure_view.columns.drag_area_label"),
+                                          appendToComponent: true
+                                        } %>
+    <% end %>
+  <% end %>
+  <%= render(Primer::Alpha::Dialog::Footer.new) do %>
+    <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { t(:button_cancel) } %>
+    <%= render(Primer::Beta::Button.new(scheme: :primary, type: :submit, data: { "test-selector": "#{MODAL_ID}-submit" }, form: QUERY_FORM_ID)) { t(:button_apply) } %>
+  <% end %>
+<% end %>
diff --git a/app/components/users/configure_view_modal_component.rb b/app/components/users/configure_view_modal_component.rb
new file mode 100644
index 00000000000..7800523a75a
--- /dev/null
+++ b/app/components/users/configure_view_modal_component.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Users
+  class ConfigureViewModalComponent < ApplicationComponent
+    include OpTurbo::Streamable
+
+    MODAL_ID = "op-user-list-configure-dialog"
+    QUERY_FORM_ID = "op-user-list-configure-query-form"
+    COLUMN_HTML_NAME = "columns"
+    COLUMN_HTML_ID = "columns-select"
+
+    options :query
+
+    def selectable_columns
+      @selectable_columns ||= UserQuery.new
+                                       .available_selects
+                                       .reject { |c| text_format_custom_field?(c) }
+                                       .sort_by(&:caption)
+                                       .map { |c| { id: c.attribute, name: c.caption } }
+    end
+
+    def selected_columns
+      @selected_columns ||= query.selects
+                                 .reject { |c| text_format_custom_field?(c) }
+                                 .map { |c| { id: c.attribute, name: c.caption } }
+    end
+
+    private
+
+    def text_format_custom_field?(select)
+      select.is_a?(Queries::Users::Selects::CustomField) &&
+        select.custom_field&.field_format == "text"
+    end
+  end
+end
diff --git a/app/components/users/index_page_header_component.html.erb b/app/components/users/index_page_header_component.html.erb
index 10c654cf975..bacbcba5285 100644
--- a/app/components/users/index_page_header_component.html.erb
+++ b/app/components/users/index_page_header_component.html.erb
@@ -1,17 +1,35 @@
-<%= render(Primer::OpenProject::PageHeader.new) do |header| %>
-  <% header.with_title { t(:label_user_plural) } %>
-  <% header.with_breadcrumbs(breadcrumb_items) %>
-  <% header.with_description do %>
-    <%= t(:label_enterprise_active_users, current: OpenProject::Enterprise.active_user_count, limit: user_limit) %>
-    &nbsp;
-    <%= render(
-          Primer::Beta::Button.new(
-            scheme: :primary,
-            size: :small,
-            tag: :a,
-            href: OpenProject::Enterprise.upgrade_path,
-            title: t(:title_enterprise_upgrade)
-          )
-        ) { t(:button_upgrade) } %>
-  <% end if user_limit %>
+<%= component_wrapper do %>
+  <%= render(Primer::OpenProject::PageHeader.new) do |header| %>
+    <% header.with_title { t(:label_user_plural) } %>
+    <% header.with_breadcrumbs(breadcrumb_items) %>
+    <% header.with_description do %>
+      <%= t(:label_enterprise_active_users, current: OpenProject::Enterprise.active_user_count, limit: user_limit) %>
+      &nbsp;
+      <%= render(
+            Primer::Beta::Button.new(
+              scheme: :primary,
+              size: :small,
+              tag: :a,
+              href: OpenProject::Enterprise.upgrade_path,
+              title: t(:title_enterprise_upgrade)
+            )
+          ) { t(:button_upgrade) } %>
+    <% end if user_limit %>
+    <% header.with_action_menu(
+         menu_arguments: { anchor_align: :end },
+         button_arguments: {
+           icon: "kebab-horizontal",
+           "aria-label": t(:label_more)
+         }
+       ) do |menu| %>
+      <% menu.with_item(
+           tag: :a,
+           label: t(:"queries.configure_view.heading"),
+           href: configure_view_modal_path,
+           content_arguments: { data: { controller: "async-dialog" }, rel: "nofollow" }
+         ) do |item| %>
+        <% item.with_leading_visual_icon(icon: :gear) %>
+      <% end %>
+    <% end %>
+  <% end %>
 <% end %>
diff --git a/app/components/users/index_page_header_component.rb b/app/components/users/index_page_header_component.rb
index 243af54b74f..49fd0435999 100644
--- a/app/components/users/index_page_header_component.rb
+++ b/app/components/users/index_page_header_component.rb
@@ -29,9 +29,12 @@
 # ++
 
 class Users::IndexPageHeaderComponent < ApplicationComponent
+  include OpTurbo::Streamable
   include OpPrimer::ComponentHelpers
   include ApplicationHelper
 
+  options :query
+
   delegate :user_limit, to: :"OpenProject::Enterprise"
 
   def breadcrumb_items
@@ -39,4 +42,23 @@ class Users::IndexPageHeaderComponent < ApplicationComponent
      { href: admin_settings_users_path, text: t(:label_user_and_permission) },
      t(:label_user_plural)]
   end
+
+  def configure_view_modal_path
+    helpers.configure_view_modal_users_path(query_params)
+  end
+
+  private
+
+  def query_params
+    { filters: helpers.params[:filters],
+      sortBy: helpers.params[:sortBy],
+      columns: current_columns }.compact_blank
+  end
+
+  def current_columns
+    return if query.nil?
+
+    cols = query.selects.map { |s| s.attribute.to_s }.join(" ")
+    cols.presence
+  end
 end
diff --git a/app/components/users/index_sub_header_component.html.erb b/app/components/users/index_sub_header_component.html.erb
index acad7b63cc4..87e32613d84 100644
--- a/app/components/users/index_sub_header_component.html.erb
+++ b/app/components/users/index_sub_header_component.html.erb
@@ -1,5 +1,5 @@
 <%=
-  render(Primer::OpenProject::SubHeader.new) do |subheader|
+  render(Primer::OpenProject::SubHeader.new(data: sub_header_data_attributes)) do |subheader|
     subheader.with_action_button(
       scheme: :primary,
       leading_icon: :plus,
@@ -10,8 +10,21 @@
       t("activerecord.models.user")
     end
 
+    subheader.with_filter_input(
+      name: "any_name_attribute",
+      label: t(:label_search),
+      value: filter_input_value,
+      placeholder: t(:label_search),
+      clear_button_id: clear_button_id,
+      data: filter_input_data_attributes
+    )
+
+    subheader.with_filter_component do
+      render Users::UserFilterButtonComponent.new(query: @query)
+    end
+
     subheader.with_bottom_pane_component do
-      render Users::UserFilterComponent.new(@params, groups: @groups, status: @status)
+      render Users::UserFiltersComponent.new(query: @query, initially_expanded: filters_expanded?)
     end
   end
 %>
diff --git a/app/components/users/index_sub_header_component.rb b/app/components/users/index_sub_header_component.rb
index 8f4ed16d22c..700a233ee95 100644
--- a/app/components/users/index_sub_header_component.rb
+++ b/app/components/users/index_sub_header_component.rb
@@ -32,11 +32,39 @@ module Users
   class IndexSubHeaderComponent < ApplicationComponent
     include ApplicationHelper
 
-    def initialize(groups:, status:, params:)
+    def initialize(query:)
       super
-      @groups = groups
-      @status = status
-      @params = params
+      @query = query
+    end
+
+    def filter_input_value
+      @query.find_active_filter(:any_name_attribute)&.values&.first
+    end
+
+    def sub_header_data_attributes
+      {
+        controller: "filter--filters-form",
+        "filter--filters-form-perform-turbo-requests-value": true,
+        "filter--filters-form-clear-button-id-value": clear_button_id,
+        "filter--filters-form-display-filters-value": filters_expanded?
+      }
+    end
+
+    def filter_input_data_attributes
+      {
+        "filter-name": "any_name_attribute",
+        "filter-type": "string",
+        "filter-operator": "~",
+        "filter--filters-form-target": "simpleFilter filterValueContainer simpleValue"
+      }
+    end
+
+    def clear_button_id
+      "user-filters-form-clear-button"
+    end
+
+    def filters_expanded?
+      params[:filters].present?
     end
   end
 end
diff --git a/app/components/users/row_component.rb b/app/components/users/row_component.rb
index b25130224af..998c7c9774d 100644
--- a/app/components/users/row_component.rb
+++ b/app/components/users/row_component.rb
@@ -98,14 +98,25 @@ module Users
       user.admin? && !table.current_user.admin?
     end
 
+    def column_value(column)
+      return custom_field_column(column) if custom_field_column?(column)
+
+      send(column.respond_to?(:attribute) ? column.attribute : column)
+    end
+
     def column_css_class(column)
-      if column == :mail
-        "email"
-      elsif column == :login
-        "username"
-      else
-        super
+      attr = column.respond_to?(:attribute) ? column.attribute : column
+      case attr
+      when :mail then "email"
+      when :login then "username"
+      else attr.to_s
       end
     end
+
+    private
+
+    def custom_field_column_subject
+      user
+    end
   end
 end
diff --git a/app/components/users/table_component.rb b/app/components/users/table_component.rb
index 06590dbd44f..fcf8cf36016 100644
--- a/app/components/users/table_component.rb
+++ b/app/components/users/table_component.rb
@@ -33,21 +33,35 @@ module Users
     columns :login, :firstname, :lastname, :mail, :admin, :created_at, :last_login_on
     options :current_user
 
+    def before_render
+      @user_query = model if model.is_a?(Queries::BaseQuery)
+      super
+    end
+
+    def columns
+      @columns ||= if @user_query&.selects&.any?
+                     @user_query.selects
+                   else
+                     super
+                   end
+    end
+
     def initial_sort
       %i[id asc]
     end
 
     def headers
-      columns.map do |name|
-        [name.to_s, header_options(name)]
+      columns.map do |column|
+        key = column.respond_to?(:attribute) ? column.attribute.to_s : column.to_s
+        [key, header_options(column)]
       end
     end
 
-    def header_options(name)
-      options = { caption: User.human_attribute_name(name) }
-
-      options[:default_order] = "desc" if desc_by_default.include? name
-
+    def header_options(column)
+      attr = column.respond_to?(:attribute) ? column.attribute : column
+      caption = column.respond_to?(:caption) ? column.caption : User.human_attribute_name(attr)
+      options = { caption: }
+      options[:default_order] = "desc" if desc_by_default.include?(attr)
       options
     end
 
diff --git a/app/components/users/user_filter_button_component.rb b/app/components/users/user_filter_button_component.rb
new file mode 100644
index 00000000000..a055d4402a1
--- /dev/null
+++ b/app/components/users/user_filter_button_component.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Users
+  class UserFilterButtonComponent < Filter::FilterButtonComponent
+    HIDDEN_FILTERS = [
+      Queries::Users::Filters::AnyNameAttributeFilter,
+      Queries::Users::Filters::BlockedFilter
+    ].freeze
+
+    private
+
+    def filters_count
+      query.filters.count { |f| HIDDEN_FILTERS.none? { |klass| f.is_a?(klass) } }
+    end
+  end
+end
diff --git a/app/components/users/user_filters_component.rb b/app/components/users/user_filters_component.rb
new file mode 100644
index 00000000000..912b49e9f60
--- /dev/null
+++ b/app/components/users/user_filters_component.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Users
+  class UserFiltersComponent < Filter::FilterComponent
+    def turbo_requests? = true
+
+    def allowed_filters
+      super
+        .grep_v(Queries::Users::Filters::AnyNameAttributeFilter)
+        .grep_v(Queries::Users::Filters::BlockedFilter)
+        .sort_by(&:human_name)
+    end
+
+    protected
+
+    def additional_filter_attributes(filter)
+      case filter
+      when Queries::Users::Filters::GroupFilter
+        {
+          autocomplete_options: {
+            component: "opce-group-autocompleter",
+            resource: "groups"
+          }
+        }
+      else
+        super
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/blankslate_component.html.erb b/app/components/work_package_types/form_configuration/blankslate_component.html.erb
new file mode 100644
index 00000000000..a98ef27cc1b
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/blankslate_component.html.erb
@@ -0,0 +1,7 @@
+<%=
+  render(Primer::Beta::Blankslate.new(border: true, test_selector: "type-form-configuration-blankslate")) do |blankslate|
+    blankslate.with_visual_icon(icon: :rows)
+    blankslate.with_heading(tag: :h3) { t("types.edit.form_configuration.blankslate_title") }
+    blankslate.with_description { t("types.edit.form_configuration.blankslate_description") }
+  end
+%>
diff --git a/app/components/users/user_filter_component.rb b/app/components/work_package_types/form_configuration/blankslate_component.rb
similarity index 88%
rename from app/components/users/user_filter_component.rb
rename to app/components/work_package_types/form_configuration/blankslate_component.rb
index ed4242adfa2..2814c3a1151 100644
--- a/app/components/users/user_filter_component.rb
+++ b/app/components/work_package_types/form_configuration/blankslate_component.rb
@@ -28,14 +28,9 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-module Users
-  class UserFilterComponent < ::UserFilterComponent
-    def filter_role(query, role_id)
-      super.uniq
-    end
-
-    def clear_url
-      users_path
+module WorkPackageTypes
+  module FormConfiguration
+    class BlankslateComponent < ApplicationComponent
     end
   end
 end
diff --git a/app/components/work_package_types/form_configuration/group_attribute_row_component.html.erb b/app/components/work_package_types/form_configuration/group_attribute_row_component.html.erb
new file mode 100644
index 00000000000..8ad7d6a2a65
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_attribute_row_component.html.erb
@@ -0,0 +1,74 @@
+<%=
+  flex_layout(justify_content: :space_between, align_items: :center) do |row|
+    row.with_column(flex_layout: true, align_items: :center, flex: 1) do |left|
+      left.with_column(mr: 2, classes: "hide-when-print type-form-configuration-page--drag-handle") do
+        render(
+          Primer::OpenProject::DragHandle.new(
+            classes: "attribute-handle",
+            "aria-label": t("types.edit.form_configuration.drag_to_reorder"),
+            test_selector: "type-form-configuration-attribute-handle-#{@attribute[:key]}"
+          )
+        )
+      end
+      left.with_column(flex: 1) do
+        render(Primer::Beta::Text.new) { @attribute[:translation] }
+      end
+    end
+
+    row.with_column(classes: "hide-when-print type-form-configuration-page--actions") do
+      render(Primer::Alpha::ActionMenu.new) do |menu|
+        menu.with_show_button(
+          icon: "kebab-horizontal",
+          scheme: :invisible,
+          size: :small,
+          classes: "type-form-configuration-page--actions-button",
+          test_selector: "type-form-configuration-attribute-actions-#{@attribute[:key]}",
+          "aria-label": t("types.edit.form_configuration.row_actions")
+        )
+
+        if attribute_can_move_up?
+          move_action(
+            menu:,
+            href: row_move_path(:highest),
+            label: t("label_agenda_item_move_to_top"),
+            icon: "move-to-top"
+          )
+          move_action(
+            menu:,
+            href: row_move_path(:higher),
+            label: t("label_agenda_item_move_up"),
+            icon: "chevron-up"
+          )
+        end
+
+        if attribute_can_move_down?
+          move_action(
+            menu:,
+            href: row_move_path(:lower),
+            label: t("label_agenda_item_move_down"),
+            icon: "chevron-down"
+          )
+          move_action(
+            menu:,
+            href: row_move_path(:lowest),
+            label: t("label_agenda_item_move_to_bottom"),
+            icon: "move-to-bottom"
+          )
+        end
+
+        menu.with_divider if show_delete_divider?
+
+        menu.with_item(
+          label: t("button_delete"),
+          test_selector: "type-form-configuration-delete-attribute-#{@attribute[:key]}",
+          scheme: :danger,
+          tag: :a,
+          href: row_destroy_path,
+          content_arguments: { data: { turbo_method: :delete, turbo_stream: true } }
+        ) do |item|
+          item.with_leading_visual_icon(icon: :trash)
+        end
+      end
+    end
+  end
+%>
diff --git a/app/components/work_package_types/form_configuration/group_attribute_row_component.rb b/app/components/work_package_types/form_configuration/group_attribute_row_component.rb
new file mode 100644
index 00000000000..38f8d859adb
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_attribute_row_component.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class GroupAttributeRowComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
+
+      def initialize(attribute:, type:, index:, total_count:)
+        super
+        @attribute = attribute
+        @type = type
+        @index = index
+        @total_count = total_count
+      end
+
+      private
+
+      def multiple_attributes?
+        @total_count > 1
+      end
+
+      def attribute_can_move_up?
+        multiple_attributes? && !@index.zero?
+      end
+
+      def attribute_can_move_down?
+        multiple_attributes? && @index != @total_count - 1
+      end
+
+      def show_delete_divider?
+        attribute_can_move_up? || attribute_can_move_down?
+      end
+
+      def row_move_path(move_to)
+        move_type_form_configuration_row_path(@type, @attribute[:key], move_to:)
+      end
+
+      def row_destroy_path
+        type_form_configuration_row_path(@type, @attribute[:key])
+      end
+
+      def move_action(menu:, href:, label:, icon:)
+        menu.with_item(
+          label:,
+          tag: :a,
+          href:,
+          content_arguments: { data: { turbo_method: :put, turbo_stream: true } }
+        ) do |item|
+          item.with_leading_visual_icon(icon:)
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/group_component.html.erb b/app/components/work_package_types/form_configuration/group_component.html.erb
new file mode 100644
index 00000000000..fcd29a0c9e5
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_component.html.erb
@@ -0,0 +1,94 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%=
+  component_wrapper(
+    data: wrapper_data
+  ) do
+    render(border_box_container(mt: 3, mb: (last? ? 3 : 0), padding: :condensed, data: row_drop_target_config)) do |box|
+      box.with_header(font_weight: :bold) do
+        render(
+          WorkPackageTypes::FormConfiguration::GroupHeaderComponent.new(
+            group: @group,
+            type: @type,
+            ee_available: ee_available?,
+            first: first?,
+            last: last?,
+            edit_mode: edit_mode?,
+            form_model: @form_model
+          )
+        )
+      end
+
+      if query_group?
+        box.with_row do
+          render(
+            WorkPackageTypes::FormConfiguration::GroupQueryRowComponent.new(
+              group: @group,
+              ee_available: ee_available?
+            )
+          )
+        end
+      elsif attributes.empty?
+        box.with_row(data: { "empty-list-item": true }) do
+          flex_layout(align_items: :center) do |empty_row|
+            empty_row.with_column(mr: 2, classes: "type-form-configuration-page--row-alignment-spacer")
+            empty_row.with_column(flex: 1) do
+              render(Primer::Beta::Text.new(color: :subtle, font_style: :italic)) do
+                t("types.edit.form_configuration.empty_group_hint")
+              end
+            end
+          end
+        end
+      else
+        attributes.each_with_index do |attribute, index|
+          box.with_row(
+            data: {
+              attr_key: attribute[:key],
+              attr_translation: attribute[:translation],
+              attr_is_cf: attribute[:is_cf],
+              "draggable-id": attribute[:key],
+              "draggable-type": "attribute",
+              "drop-url": row_drop_path(attribute)
+            }
+          ) do
+            render(
+              WorkPackageTypes::FormConfiguration::GroupAttributeRowComponent.new(
+                attribute:,
+                type: @type,
+                index:,
+                total_count: attributes.length
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/app/components/work_package_types/form_configuration/group_component.rb b/app/components/work_package_types/form_configuration/group_component.rb
new file mode 100644
index 00000000000..ad825da1e6a
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_component.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class GroupComponent < ApplicationComponent
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def initialize(group:, type: nil, ee_available: false, first: false, last: false, edit_mode: false,
+                     form_model: nil)
+        super(group)
+        @group = group
+        @type = type
+        @ee_available = ee_available
+        @first = first
+        @last = last
+        @edit_mode = edit_mode
+        @form_model = form_model
+        @instance_uid = SecureRandom.hex(4)
+      end
+
+      def wrapper_uniq_by
+        @group[:key].presence || @instance_uid
+      end
+
+      def edit_mode?
+        @edit_mode
+      end
+
+      def query_group?
+        @group[:type].to_s == "query"
+      end
+
+      def attributes
+        @group[:attributes] || []
+      end
+
+      def first?
+        @first
+      end
+
+      def last?
+        @last
+      end
+
+      def ee_available?
+        @ee_available
+      end
+
+      private
+
+      def wrapper_data
+        {
+          group_type: @group[:type].to_s,
+          group_key: @group[:key].to_s,
+          group_query: @group[:query],
+          edit_mode: (true if edit_mode?)
+        }.compact.merge(draggable_item_config)
+      end
+
+      def group_name
+        @group[:name]
+      end
+
+      def temporary_group?
+        @group[:temporary]
+      end
+
+      def draggable_item_config
+        return {} if @group[:key].blank? || temporary_group?
+
+        {
+          "draggable-id": @group[:key],
+          "draggable-type": "group",
+          "drop-url": drop_type_form_configuration_group_path(@type, @group[:key])
+        }
+      end
+
+      def row_drop_target_config
+        return {} if query_group? || @group[:key].blank? || temporary_group?
+
+        {
+          "admin--type-form-configuration--rows-drag-and-drop-target": "container",
+          "target-container-accessor": ".Box > ul",
+          "target-id": @group[:key],
+          "target-allowed-drag-type": "attribute"
+        }
+      end
+
+      def edit_path
+        edit_type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def update_path
+        type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def cancel_edit_path
+        cancel_edit_type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def move_path(move_to)
+        move_type_form_configuration_group_path(@type, @group[:key], move_to:)
+      end
+
+      def destroy_path
+        type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def row_drop_path(attribute)
+        drop_type_form_configuration_row_path(@type, attribute[:key])
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/group_header_component.html.erb b/app/components/work_package_types/form_configuration/group_header_component.html.erb
new file mode 100644
index 00000000000..b4a49ebe404
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_header_component.html.erb
@@ -0,0 +1,99 @@
+<% if edit_mode? %>
+  <%=
+    primer_form_with(
+      model: form_model,
+      scope: :group,
+      method: form_method,
+      url: update_path,
+      test_selector: "type-form-configuration-group-edit-form",
+      data: {
+        turbo_stream: true
+      }
+    ) do |form|
+      render(
+        WorkPackageTypes::FormConfiguration::GroupForm.new(
+          form,
+          cancel_path: cancel_edit_path
+        )
+      )
+    end
+  %>
+<% else %>
+  <%=
+    flex_layout(justify_content: :space_between, align_items: :center) do |header|
+      header.with_column(flex_layout: true, align_items: :center, flex: 1) do |left|
+        left.with_column(mr: 2, classes: "hide-when-print type-form-configuration-page--drag-handle") do
+          render(
+            Primer::OpenProject::DragHandle.new(
+              classes: "group-handle",
+              "aria-label": t("types.edit.form_configuration.drag_to_reorder"),
+              test_selector: "type-form-configuration-group-handle-#{@group[:key]}"
+            )
+          )
+        end
+        left.with_column(flex: 1) do
+          render(Primer::Beta::Text.new(font_weight: :bold)) { group_name }
+        end
+      end
+
+      header.with_column(classes: "hide-when-print type-form-configuration-page--actions") do
+        render(Primer::Alpha::ActionMenu.new) do |menu|
+          menu.with_show_button(
+            icon: "kebab-horizontal",
+            scheme: :invisible,
+            size: :small,
+            classes: "type-form-configuration-page--actions-button",
+            test_selector: "type-form-configuration-group-actions-#{@group[:key]}",
+            "aria-label": t("types.edit.form_configuration.group_actions")
+          )
+
+          if ee_available?
+            with_item_group(menu) do
+              menu.with_item(
+                label: t("types.edit.form_configuration.rename_group"),
+                test_selector: "type-form-configuration-group-rename-#{@group[:key]}",
+                tag: :a,
+                href: edit_path,
+                content_arguments: { data: { turbo_stream: true } }
+              ) do |item|
+                item.with_leading_visual_icon(icon: :pencil)
+              end
+            end
+          end
+
+          with_item_group(menu) do
+            unless first?
+              move_action(menu:, href: move_path(:highest), label: t("label_agenda_item_move_to_top"), icon: "move-to-top")
+              move_action(menu:, href: move_path(:higher), label: t("label_agenda_item_move_up"), icon: "chevron-up")
+            end
+
+            unless last?
+              move_action(menu:, href: move_path(:lower), label: t("label_agenda_item_move_down"), icon: "chevron-down")
+              move_action(menu:, href: move_path(:lowest), label: t("label_agenda_item_move_to_bottom"), icon: "move-to-bottom")
+            end
+          end
+
+          if ee_available?
+            with_item_group(menu) do
+              menu.with_item(
+                label: t("button_delete"),
+                scheme: :danger,
+                tag: :a,
+                href: destroy_path,
+                content_arguments: {
+                  data: {
+                    turbo_method: :delete,
+                    turbo_stream: true,
+                    turbo_confirm: t("types.edit.form_configuration.confirm_delete_group")
+                  }
+                }
+              ) do |item|
+                item.with_leading_visual_icon(icon: :trash)
+              end
+            end
+          end
+        end
+      end
+    end
+  %>
+<% end %>
diff --git a/app/components/work_package_types/form_configuration/group_header_component.rb b/app/components/work_package_types/form_configuration/group_header_component.rb
new file mode 100644
index 00000000000..fc796b936a2
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_header_component.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class GroupHeaderComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
+
+      def initialize(group:, type:, ee_available:, first:, last:, edit_mode:, form_model: nil)
+        super
+        @group = group
+        @type = type
+        @ee_available = ee_available
+        @first = first
+        @last = last
+        @edit_mode = edit_mode
+        @form_model = form_model
+      end
+
+      def edit_mode?
+        @edit_mode
+      end
+
+      private
+
+      def group_name
+        @group[:name]
+      end
+
+      def form_model
+        @form_model || WorkPackageTypes::FormConfiguration::GroupFormModel.from_group(@group)
+      end
+
+      def ee_available?
+        @ee_available
+      end
+
+      def first?
+        @first
+      end
+
+      def last?
+        @last
+      end
+
+      def edit_path
+        edit_type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def update_path
+        return create_path if temporary_group?
+
+        type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def form_method
+        temporary_group? ? :post : :patch
+      end
+
+      def cancel_edit_path
+        cancel_edit_type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def move_path(move_to)
+        move_type_form_configuration_group_path(@type, @group[:key], move_to:)
+      end
+
+      def destroy_path
+        type_form_configuration_group_path(@type, @group[:key])
+      end
+
+      def temporary_group?
+        @group[:temporary]
+      end
+
+      def create_path
+        type_form_configuration_groups_path(@type)
+      end
+
+      def move_action(menu:, href:, label:, icon:)
+        menu.with_item(
+          label:,
+          tag: :a,
+          href:,
+          content_arguments: { data: { turbo_method: :put, turbo_stream: true } }
+        ) do |item|
+          item.with_leading_visual_icon(icon:)
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/group_query_row_component.html.erb b/app/components/work_package_types/form_configuration/group_query_row_component.html.erb
new file mode 100644
index 00000000000..771902361c5
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/group_query_row_component.html.erb
@@ -0,0 +1,49 @@
+<%=
+  flex_layout(justify_content: :space_between, align_items: :center) do |row|
+    row.with_column(flex_layout: true, align_items: :center, flex: 1) do |left|
+      left.with_column(mr: 2, classes: "type-form-configuration-page--row-alignment-spacer")
+      left.with_column(flex: 1) do
+        if ee_available?
+          render(
+            Primer::Beta::Button.new(
+              scheme: :link,
+              data: { action: "click->admin--type-form-configuration--main#editQuery" }
+            )
+          ) do
+            t("types.edit.form_configuration.query_group_label")
+          end
+        else
+          render(Primer::Beta::Text.new(color: :subtle, font_style: :italic)) do
+            t("types.edit.form_configuration.query_group_label")
+          end
+        end
+      end
+    end
+
+    if ee_available?
+      row.with_column(classes: "hide-when-print type-form-configuration-page--actions") do
+        render(Primer::Alpha::ActionMenu.new) do |menu|
+          menu.with_show_button(
+            icon: "kebab-horizontal",
+            scheme: :invisible,
+            size: :small,
+            classes: "type-form-configuration-page--actions-button",
+            test_selector: "type-form-configuration-query-actions-#{@group[:key]}",
+            "aria-label": t("types.edit.form_configuration.row_actions")
+          )
+
+          menu.with_item(
+            label: t("types.edit.form_configuration.edit_query"),
+            test_selector: "type-form-configuration-edit-query-#{@group[:key]}",
+            tag: :button,
+            content_arguments: {
+              data: { action: "click->admin--type-form-configuration--main#editQuery" }
+            }
+          ) do |item|
+            item.with_leading_visual_icon(icon: :pencil)
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/app/components/open_project/common/work_package_card_list_component/empty_item.rb b/app/components/work_package_types/form_configuration/group_query_row_component.rb
similarity index 72%
rename from app/components/open_project/common/work_package_card_list_component/empty_item.rb
rename to app/components/work_package_types/form_configuration/group_query_row_component.rb
index c6849109532..20e0073f58a 100644
--- a/app/components/open_project/common/work_package_card_list_component/empty_item.rb
+++ b/app/components/work_package_types/form_configuration/group_query_row_component.rb
@@ -28,23 +28,21 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-module OpenProject
-  module Common
-    class WorkPackageCardListComponent
-      # Row bridge for caller-provided empty content.
-      class EmptyItem < ContentItem
-        include Primer::AttributesHelper
+module WorkPackageTypes
+  module FormConfiguration
+    class GroupQueryRowComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
 
-        def row_args
-          system_arguments = @system_arguments.deep_dup
-          system_arguments[:data] = merge_data(
-            { data: { empty_list_item: true } },
-            system_arguments
-          )
-          system_arguments
-        end
+      def initialize(group:, ee_available:)
+        super
+        @group = group
+        @ee_available = ee_available
+      end
 
-        def empty_item? = true
+      private
+
+      def ee_available?
+        @ee_available
       end
     end
   end
diff --git a/app/components/work_package_types/form_configuration/inactive_attributes_list_component.html.erb b/app/components/work_package_types/form_configuration/inactive_attributes_list_component.html.erb
new file mode 100644
index 00000000000..8e125cd42ac
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/inactive_attributes_list_component.html.erb
@@ -0,0 +1,43 @@
+<%=
+  component_wrapper(
+    id: "type-form-configuration-inactive-container",
+    data: container_data
+  ) do
+    render(
+      Primer::Alpha::ActionList.new(
+        role: :list,
+        classes: "type-form-configuration-page--inactive-list",
+        data: { "test-selector": "type-form-configuration-inactive-list" }
+      )
+    ) do |list|
+      if @inactive_attributes.empty?
+        list.with_item(
+          label: t("types.edit.form_configuration.no_inactive_attributes"),
+          disabled: true,
+          classes: "type-form-configuration-page--inactive-empty",
+          content_arguments: { tag: :div },
+          data: { "empty-list-item": true, "filter--filter-list-target": "searchItem" }
+        )
+      else
+        @inactive_attributes.each do |attribute|
+          list.with_item(
+            label: attribute[:translation],
+            classes: "type-form-configuration-page--inactive-item",
+            content_arguments: { tag: :div },
+            data: item_data(attribute).merge("filter--filter-list-target": "searchItem")
+          ) do |item|
+            item.with_leading_visual_raw_content do
+              render(
+                Primer::OpenProject::DragHandle.new(
+                  classes: "attribute-handle",
+                  "aria-label": t("types.edit.form_configuration.drag_to_reorder"),
+                  test_selector: "type-form-configuration-attribute-handle-#{attribute[:key]}"
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/app/components/work_package_types/form_configuration/inactive_attributes_list_component.rb b/app/components/work_package_types/form_configuration/inactive_attributes_list_component.rb
new file mode 100644
index 00000000000..ff84d60d9d2
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/inactive_attributes_list_component.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class InactiveAttributesListComponent < ApplicationComponent
+      include OpTurbo::Streamable
+
+      def initialize(type:, inactive_attributes:)
+        super
+        @type = type
+        @inactive_attributes = inactive_attributes
+      end
+
+      private
+
+      def container_data
+        {
+          "test-selector": "type-form-configuration-inactive-container",
+          "admin--type-form-configuration--main-target": "inactiveContainer",
+          "admin--type-form-configuration--rows-drag-and-drop-target": "container",
+          "target-container-accessor": "[data-test-selector='type-form-configuration-inactive-list']",
+          "target-id": "inactive",
+          "target-allowed-drag-type": "attribute"
+        }
+      end
+
+      def item_data(attribute)
+        {
+          attr_key: attribute[:key],
+          attr_translation: attribute[:translation],
+          attr_is_cf: attribute[:is_cf],
+          "draggable-id": attribute[:key],
+          "draggable-type": "attribute",
+          "drop-url": drop_type_form_configuration_row_path(@type, attribute[:key])
+        }
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/inactive_attributes_sidebar_component.html.erb b/app/components/work_package_types/form_configuration/inactive_attributes_sidebar_component.html.erb
new file mode 100644
index 00000000000..02e359f19d6
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/inactive_attributes_sidebar_component.html.erb
@@ -0,0 +1,42 @@
+<%=
+  flex_layout(data: { controller: "filter--filter-list" }) do |flex|
+    flex.with_row(mb: 1) do
+      render(Primer::Beta::Heading.new(tag: :h3, font_size: 4)) do
+        t("types.edit.form_configuration.inactive_attributes_heading")
+      end
+    end
+
+    flex.with_row(mb: 3) do
+      render(Primer::Beta::Text.new(color: :subtle, font_size: :small)) do
+        t("types.edit.form_configuration.drag_to_activate")
+      end
+    end
+
+    flex.with_row(mb: 3) do
+      render(
+        Primer::Alpha::TextField.new(
+          name: "inactive-filter",
+          label: t("types.edit.form_configuration.filter_inactive"),
+          visually_hide_label: true,
+          placeholder: t("types.edit.form_configuration.filter_inactive"),
+          leading_visual: { icon: :search },
+          size: :medium,
+          "full-width": true,
+          data: {
+            action: "input->filter--filter-list#filterLists",
+            "filter--filter-list-target": "filter"
+          }
+        )
+      )
+    end
+
+    flex.with_row do
+      render(
+        WorkPackageTypes::FormConfiguration::InactiveAttributesListComponent.new(
+          inactive_attributes: @inactive_attributes,
+          type: @type
+        )
+      )
+    end
+  end
+%>
diff --git a/app/components/work_package_types/form_configuration/inactive_attributes_sidebar_component.rb b/app/components/work_package_types/form_configuration/inactive_attributes_sidebar_component.rb
new file mode 100644
index 00000000000..db4634d6127
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/inactive_attributes_sidebar_component.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class InactiveAttributesSidebarComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
+
+      def initialize(type:, inactive_attributes:)
+        super
+        @type = type
+        @inactive_attributes = inactive_attributes
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/main_content_component.html.erb b/app/components/work_package_types/form_configuration/main_content_component.html.erb
new file mode 100644
index 00000000000..2c6a832a94a
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/main_content_component.html.erb
@@ -0,0 +1,73 @@
+<%=
+  component_wrapper(
+    class: "type-form-configuration-page--main-inner",
+    data: main_inner_data
+  ) do
+    flex_layout do |main|
+      main.with_row do
+        render(Primer::OpenProject::SubHeader.new(mb: 0)) do |subheader|
+          subheader.with_action_button(
+            tag: :a,
+            scheme: :secondary,
+            leading_icon: :undo,
+            label: t("types.edit.form_configuration.reset_to_defaults"),
+            href: reset_dialog_type_form_configuration_path(@type),
+            "data-test-selector": "type-form-configuration-reset-button",
+            data: { controller: "async-dialog" }
+          ) do
+            t("types.edit.form_configuration.reset_to_defaults")
+          end
+
+          if ee_available?
+            subheader.with_action_menu(
+              leading_icon: :plus,
+              trailing_icon: :"triangle-down",
+              label: t(:button_add),
+              anchor_align: :end,
+              button_arguments: {
+                scheme: :primary,
+                "aria-label": t(:button_add),
+                "data-test-selector": "type-form-configuration-add-button"
+              }
+            ) do |menu|
+              menu.with_item(
+                label: t("types.edit.form_configuration.add_attribute_group"),
+                tag: :a,
+                href: add_group_type_form_configuration_groups_path(@type, group_type: :attribute),
+                content_arguments: {
+                  data: { turbo_method: :post, turbo_stream: true }
+                }
+              ) do |item|
+                item.with_leading_visual_icon(icon: :rows)
+              end
+
+              menu.with_item(
+                label: t("types.edit.form_configuration.add_query_group"),
+                tag: :button,
+                content_arguments: {
+                  data: { action: "click->admin--type-form-configuration--main#addQueryGroup" }
+                }
+              ) do |item|
+                item.with_leading_visual_icon(icon: :table)
+              end
+            end
+          end
+        end
+      end
+
+      main.with_row do
+        content_tag(
+          :div,
+          id: "type-form-configuration-groups-container",
+          data: groups_container_data
+        ) do
+          if @group_components.empty?
+            render(WorkPackageTypes::FormConfiguration::BlankslateComponent.new)
+          else
+            safe_join(@group_components.map { |group| render(group) })
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/app/components/work_package_types/form_configuration/main_content_component.rb b/app/components/work_package_types/form_configuration/main_content_component.rb
new file mode 100644
index 00000000000..bae22743782
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/main_content_component.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class MainContentComponent < ApplicationComponent
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def initialize(type:, group_components:, ee_available:)
+        super
+        @type = type
+        @group_components = group_components
+        @ee_available = ee_available
+      end
+
+      private
+
+      def ee_available?
+        @ee_available
+      end
+
+      def main_inner_data
+        {
+          controller: "admin--type-form-configuration--drag-and-drop",
+          "admin--type-form-configuration--drag-and-drop-handle-selector-value": ".group-handle"
+        }
+      end
+
+      def groups_container_data
+        {
+          "test-selector": "type-form-configuration-groups-container",
+          "admin--type-form-configuration--main-target": "groupsContainer",
+          "admin--type-form-configuration--drag-and-drop-target": "container",
+          "target-allowed-drag-type": "group"
+        }
+      end
+    end
+  end
+end
diff --git a/app/components/work_package_types/form_configuration/reset_dialog_component.html.erb b/app/components/work_package_types/form_configuration/reset_dialog_component.html.erb
new file mode 100644
index 00000000000..a77621e16c6
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/reset_dialog_component.html.erb
@@ -0,0 +1,24 @@
+<%=
+  render(
+    Primer::OpenProject::DangerDialog.new(
+      id: "type-form-configuration-reset-dialog",
+      test_selector: "type-form-configuration-reset-dialog",
+      title: t("types.edit.form_configuration.reset_title"),
+      confirm_button_text: t("button_reset"),
+      form_arguments: {
+        action: type_form_configuration_path(@type),
+        method: :patch,
+        data: { turbo_stream: true }
+      }
+    )
+  ) do |dialog|
+    dialog.with_confirmation_message do |message|
+      message.with_heading(tag: :h2) { t("types.edit.form_configuration.confirm_reset") }
+      message.with_description_content(t("types.edit.form_configuration.reset_description"))
+    end
+
+    dialog.with_additional_details do
+      hidden_field_tag("type[attribute_groups]", "[]")
+    end
+  end
+%>
diff --git a/app/components/work_package_types/form_configuration/reset_dialog_component.rb b/app/components/work_package_types/form_configuration/reset_dialog_component.rb
new file mode 100644
index 00000000000..875e62b8b56
--- /dev/null
+++ b/app/components/work_package_types/form_configuration/reset_dialog_component.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class ResetDialogComponent < ApplicationComponent
+      include OpTurbo::Streamable
+
+      def initialize(type:)
+        super
+        @type = type
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/views/meeting_series_mailer/participant_added.text.erb b/app/components/work_package_types/form_configuration_component.html.erb
similarity index 52%
rename from modules/meeting/app/views/meeting_series_mailer/participant_added.text.erb
rename to app/components/work_package_types/form_configuration_component.html.erb
index 4bc98e5bae5..20cfedb36b4 100644
--- a/modules/meeting/app/views/meeting_series_mailer/participant_added.text.erb
+++ b/app/components/work_package_types/form_configuration_component.html.erb
@@ -27,10 +27,28 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= I18n.t("meeting.email.participant_added.summary_series", title: @series.title, actor: @actor, participant: @added_participant) %>
+<%= component_wrapper(
+      class: "type-form-configuration-page--wrapper",
+      data: wrapper_data
+    ) do %>
+  <%= render(Primer::Alpha::Layout.new(stacking_breakpoint: :md, overflow: :hidden, h: :full, classes: "type-form-configuration-page")) do |content| %>
+    <% content.with_sidebar(row_placement: :start, col_placement: :start, border: true, border_bottom: 0, p: 3, overflow: :auto, classes: "type-form-configuration-page--sidebar") do %>
+      <%= render(
+            WorkPackageTypes::FormConfiguration::InactiveAttributesSidebarComponent.new(
+              type: @type,
+              inactive_attributes: @inactive_attributes
+            )
+          ) %>
+    <% end %>
 
-<%= @series.project.name %>: <%= @series.title %> (<%= recurring_meeting_url(@series) %>)
-
-<%= t :label_recurring_meeting_schedule %>: <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>)
-<%= Meeting.human_attribute_name(:location) %>: <%= @template.location %>
-<%= Meeting.human_attribute_name(:participants_invited) %>: <%= @template.participants.invited.sort.join("; ") %>
+    <% content.with_main(overflow: :auto, classes: "type-form-configuration-page--main") do %>
+      <%= render(
+            WorkPackageTypes::FormConfiguration::MainContentComponent.new(
+              type: @type,
+              group_components: group_components,
+              ee_available: ee_available?
+            )
+          ) %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/components/work_package_types/form_configuration_component.rb b/app/components/work_package_types/form_configuration_component.rb
new file mode 100644
index 00000000000..1d55de92325
--- /dev/null
+++ b/app/components/work_package_types/form_configuration_component.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  class FormConfigurationComponent < ApplicationComponent
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+
+    def initialize(type:, form_attributes:, no_filter_query:)
+      super(type)
+      @type = type
+      @groups = form_attributes[:actives].reject { |g| g[:key].to_s == "__empty" }
+      @inactive_attributes = form_attributes[:inactives]
+      @no_filter_query = no_filter_query
+    end
+
+    def ee_available?
+      EnterpriseToken.allows_to?(:edit_attribute_groups)
+    end
+
+    def wrapper_data
+      {
+        controller: "admin--type-form-configuration--main admin--type-form-configuration--rows-drag-and-drop",
+        "admin--type-form-configuration--main-no-filter-query-value": @no_filter_query,
+        "admin--type-form-configuration--main-add-group-url-value": add_group_type_form_configuration_groups_path(@type),
+        "admin--type-form-configuration--main-groups-url-value": type_form_configuration_groups_path(@type),
+        "admin--type-form-configuration--rows-drag-and-drop-handle-selector-value": ".attribute-handle"
+      }
+    end
+
+    def group_components
+      @groups.map.with_index do |group, i|
+        WorkPackageTypes::FormConfiguration::GroupComponent.new(
+          group:,
+          type: @type,
+          ee_available: ee_available?,
+          first: i == 0,
+          last: i == @groups.length - 1
+        )
+      end
+    end
+  end
+end
diff --git a/app/components/work_packages/bulk_delete_dialog_component.rb b/app/components/work_packages/bulk_delete_dialog_component.rb
index a3e75df4cbf..31f1f81202d 100644
--- a/app/components/work_packages/bulk_delete_dialog_component.rb
+++ b/app/components/work_packages/bulk_delete_dialog_component.rb
@@ -94,7 +94,10 @@ module WorkPackages
     end
 
     def projects
-      @projects ||= work_packages.filter_map(&:project).uniq
+      @projects ||= begin
+        all_work_packages = work_packages + descendants_by_work_package.values.flatten
+        all_work_packages.filter_map(&:project).uniq
+      end
     end
 
     def descendants_by_work_package
diff --git a/app/contracts/work_package_types/update_form_configuration_contract.rb b/app/contracts/work_package_types/update_form_configuration_contract.rb
index 8d14edc2866..4c6ed998532 100644
--- a/app/contracts/work_package_types/update_form_configuration_contract.rb
+++ b/app/contracts/work_package_types/update_form_configuration_contract.rb
@@ -48,7 +48,9 @@ module WorkPackageTypes
       seen = Set.new
       model.attribute_groups.each do |group|
         errors.add(:attribute_groups, :group_without_name) if group.key.blank?
-        errors.add(:attribute_groups, :duplicate_group, group: group.key) if seen.add?(group.key).nil?
+
+        group_name = visible_group_name(group)
+        errors.add(:attribute_groups, :duplicate_group, group: group_name) if seen.add?(group_name).nil?
       end
     end
 
@@ -65,14 +67,10 @@ module WorkPackageTypes
     end
 
     def validate_query_group(group)
-      query = group.query
+      query_call = rebuild_query_group(group)
+      return add_invalid_query_error(group, query_call.errors) unless query_call.success?
 
-      contract_class = query.persisted? ? Queries::UpdateContract : Queries::CreateContract
-      contract = contract_class.new(query, user)
-
-      unless contract.validate
-        errors.add(:attribute_groups, :query_invalid, group: group.key, details: contract.errors.full_messages.join)
-      end
+      validate_rebuilt_query_group(group, query_call.result)
     end
 
     def validate_attribute_group(group)
@@ -92,10 +90,42 @@ module WorkPackageTypes
     def custom_groups_modified?
       return false unless model.attribute_groups_changed?
 
-      old_keys = model.attribute_groups_was.map(&:first)
+      old_keys = normalized_old_keys
       new_keys = model.attribute_groups.map(&:key)
 
       (new_keys - old_keys - Type.default_groups.keys).any?
     end
+
+    def normalized_old_keys
+      seen_keys = model.attribute_groups_was.filter_map(&:first).compact_blank.map(&:to_s)
+
+      model.attribute_groups_was.map do |group|
+        key = group.first.presence&.to_s
+        key || normalized_legacy_group_key(seen_keys).tap { |legacy_key| seen_keys << legacy_key }
+      end
+    end
+
+    def normalized_legacy_group_key(seen_keys)
+      Type::FormGroup.next_untitled_key(seen_keys)
+    end
+
+    def visible_group_name(group)
+      group.translated_key.to_s.strip
+    end
+
+    def rebuild_query_group(group)
+      ::WorkPackageTypes::FormConfiguration::EmbeddedQueryBuilder.rebuild(query: group.query, user:)
+    end
+
+    def validate_rebuilt_query_group(group, query)
+      contract = Queries::CreateContract.new(query, user)
+      return if contract.validate
+
+      add_invalid_query_error(group, contract.errors)
+    end
+
+    def add_invalid_query_error(group, error_collection)
+      errors.add(:attribute_groups, :query_invalid, group: group.key, details: error_collection.full_messages.to_sentence)
+    end
   end
 end
diff --git a/app/controllers/concerns/work_package_types/form_configuration_component_streams.rb b/app/controllers/concerns/work_package_types/form_configuration_component_streams.rb
new file mode 100644
index 00000000000..a799d7b709f
--- /dev/null
+++ b/app/controllers/concerns/work_package_types/form_configuration_component_streams.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfigurationComponentStreams
+    extend ActiveSupport::Concern
+
+    private
+
+    def update_form_configuration_via_turbo_stream(**)
+      update_main_content_via_turbo_stream(**)
+      update_inactive_attributes_via_turbo_stream
+    end
+
+    def update_main_content_via_turbo_stream(groups: active_groups_for_form, editing_group_key: nil, form_model: nil)
+      ee_available = EnterpriseToken.allows_to?(:edit_attribute_groups)
+      group_components = build_group_components(
+        groups:,
+        ee_available:,
+        editing_group_key:,
+        form_model:
+      )
+
+      update_via_turbo_stream(
+        component: WorkPackageTypes::FormConfiguration::MainContentComponent.new(
+          type: @type,
+          group_components:,
+          ee_available:
+        )
+      )
+    end
+
+    def update_inactive_attributes_via_turbo_stream
+      replace_via_turbo_stream(
+        component: WorkPackageTypes::FormConfiguration::InactiveAttributesListComponent.new(
+          inactive_attributes: form_configuration_groups(@type)[:inactives],
+          type: @type
+        ),
+        target: "type-form-configuration-inactive-container"
+      )
+    end
+
+    def render_form_configuration_error(call)
+      render_error_flash_message_via_turbo_stream(message: call.errors.full_messages.to_sentence)
+    end
+
+    def build_group_components(groups:, ee_available:, editing_group_key:, form_model:)
+      groups.map.with_index do |group, index|
+        is_editing = editing_group_key.present? && group[:key].to_s == editing_group_key.to_s
+
+        WorkPackageTypes::FormConfiguration::GroupComponent.new(
+          group:,
+          type: @type,
+          ee_available:,
+          first: index.zero?,
+          last: index == groups.length - 1,
+          edit_mode: is_editing,
+          form_model: (form_model if is_editing)
+        )
+      end
+    end
+
+    def active_groups_for_form
+      form_configuration_groups(@type)[:actives].reject { |group| group[:key].to_s == "__empty" }
+    end
+  end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a2efeb23fc4..499acc91fb0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -79,11 +79,19 @@ class UsersController < ApplicationController
   include SortHelper
   include CustomFieldsHelper
   include PaginationHelper
+  include Queries::Loading
+
+  before_action :load_query_or_deny_access, only: %i[index configure_view_modal]
 
   def index
-    @groups = Group.visible.sort
-    @status = Users::UserFilterComponent.status_param params
-    @users = Users::UserFilterComponent.filter params
+    respond_to do |format|
+      format.html
+      format.turbo_stream { render_index_turbo_stream }
+    end
+  end
+
+  def configure_view_modal
+    respond_with_dialog Users::ConfigureViewModalComponent.new(query: @query)
   end
 
   def show
@@ -423,6 +431,15 @@ class UsersController < ApplicationController
              status: User.statuses[:invited])
   end
 
+  def render_index_turbo_stream # rubocop:disable Metrics/AbcSize
+    replace_via_turbo_stream(component: Users::IndexPageHeaderComponent.new(query: @query))
+    update_via_turbo_stream(component: Users::UserFilterButtonComponent.new(query: @query))
+    replace_via_turbo_stream(component: Users::TableComponent.new(rows: @query, current_user:))
+    turbo_streams << turbo_stream.push_state(url_for(params.permit(:filters, :sortBy, :sort, :page, :per_page, :columns)))
+    turbo_streams << turbo_stream.replace("primerized-flash-messages", helpers.render_flash_messages)
+    render turbo_stream: turbo_streams
+  end
+
   def prepare_views_for_tab # rubocop:disable Metrics/AbcSize
     if params[:tab] == "non_working_times"
       authorize_manage_working_times
diff --git a/app/controllers/work_package_types/form_configuration_groups_tab_controller.rb b/app/controllers/work_package_types/form_configuration_groups_tab_controller.rb
new file mode 100644
index 00000000000..a5901f94b8c
--- /dev/null
+++ b/app/controllers/work_package_types/form_configuration_groups_tab_controller.rb
@@ -0,0 +1,240 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  class FormConfigurationGroupsTabController < BaseTabController
+    include TypesHelper
+    include OpTurbo::ComponentStream
+    include WorkPackageTypes::FormConfigurationComponentStreams
+
+    TEMPORARY_GROUP_KEY = "__new_form_configuration_group__"
+
+    def edit
+      update_main_content_via_turbo_stream(editing_group_key: group_key_param)
+
+      respond_with_turbo_streams
+    end
+
+    def add_group
+      render_temporary_group_editor
+
+      respond_with_turbo_streams
+    end
+
+    def create
+      call = create_group_call
+
+      if call.success?
+        update_form_configuration_via_turbo_stream
+      else
+        render_create_error(call)
+      end
+
+      respond_with_turbo_streams(status: turbo_status_for(call))
+    end
+
+    def cancel_edit
+      if temporary_group_key?(group_key_param)
+        update_form_configuration_via_turbo_stream
+        respond_with_turbo_streams
+        return
+      end
+
+      group = find_group(group_key_param)
+      return head :not_found if group.nil?
+
+      update_main_content_via_turbo_stream
+      respond_with_turbo_streams
+    end
+
+    def update
+      call = rename_group_call
+
+      if call.success?
+        update_form_configuration_via_turbo_stream
+      else
+        render_existing_group_update_error(call)
+      end
+
+      respond_with_turbo_streams(status: turbo_status_for(call))
+    end
+
+    def destroy
+      call = ::WorkPackageTypes::FormConfigurationGroups::DeleteService
+        .new(user: current_user, type: @type, group_key: group_key_param)
+        .call
+
+      if call.success?
+        update_form_configuration_via_turbo_stream
+      else
+        render_form_configuration_error(call)
+      end
+
+      respond_with_turbo_streams(status: turbo_status_for(call))
+    end
+
+    def drop
+      call = ::WorkPackageTypes::FormConfigurationGroups::UpdateService
+        .new(user: current_user, type: @type, group_key: group_key_param)
+        .call(position: params[:position])
+
+      if call.success?
+        update_main_content_via_turbo_stream
+      else
+        render_form_configuration_error(call)
+      end
+
+      respond_with_turbo_streams(status: turbo_status_for(call))
+    end
+
+    def move
+      call = ::WorkPackageTypes::FormConfigurationGroups::UpdateService
+        .new(user: current_user, type: @type, group_key: group_key_param)
+        .call(move_to: params[:move_to])
+
+      if call.success?
+        update_main_content_via_turbo_stream
+      else
+        render_form_configuration_error(call)
+      end
+
+      respond_with_turbo_streams(status: turbo_status_for(call))
+    end
+
+    def update_query
+      call = ::WorkPackageTypes::FormConfigurationGroups::UpdateService
+        .new(user: current_user, type: @type, group_key: group_key_param)
+        .call(query_props: params[:query])
+
+      if call.success?
+        head :ok
+      else
+        render_form_configuration_error(call)
+        respond_with_turbo_streams(status: turbo_status_for(call))
+      end
+    end
+
+    private
+
+    def group_params
+      params.expect(group: %i[name group_type query])
+    end
+
+    def find_group(key)
+      @type.attribute_groups.find do |group|
+        [
+          group.key,
+          group.display_name,
+          group.translated_key
+        ].compact.map(&:to_s).include?(key.to_s)
+      end
+    end
+
+    def group_key_param
+      params[:key] || params[:id]
+    end
+
+    def temporary_group_key?(key)
+      key.to_s == TEMPORARY_GROUP_KEY
+    end
+
+    def temporary_group(group_type:, query:, name: "")
+      {
+        key: TEMPORARY_GROUP_KEY,
+        type: group_type.to_s,
+        name:,
+        attributes: [],
+        query:,
+        temporary: true
+      }
+    end
+
+    def turbo_status_for(call)
+      call.success? ? :ok : :unprocessable_entity
+    end
+
+    def create_group_call
+      ::WorkPackageTypes::FormConfigurationGroups::CreateService
+        .new(user: current_user, type: @type)
+        .call(
+          group_type: group_params[:group_type],
+          name: group_params[:name],
+          query_props: group_params[:query]
+        )
+    end
+
+    def rename_group_call
+      ::WorkPackageTypes::FormConfigurationGroups::UpdateService
+        .new(user: current_user, type: @type, group_key: group_key_param)
+        .call(name: group_params[:name])
+    end
+
+    def render_create_error(call)
+      @type.reload
+      group = temporary_group(
+        group_type: group_params[:group_type],
+        query: group_params[:query],
+        name: group_params[:name].to_s
+      )
+
+      render_temporary_group_editor(
+        group:,
+        form_model: group_form_model(group:, validation_message: call.errors.map(&:message).to_sentence)
+      )
+    end
+
+    def render_existing_group_update_error(call)
+      @type.reload
+      group = active_groups_for_form.find { |active_group| active_group[:key].to_s == group_key_param.to_s }
+
+      update_main_content_via_turbo_stream(
+        editing_group_key: group_key_param,
+        form_model: group_form_model(
+          group:,
+          name: group_params[:name].to_s,
+          validation_message: call.errors.map(&:message).to_sentence
+        )
+      )
+    end
+
+    def render_temporary_group_editor(group: temporary_group(group_type: params[:group_type], query: params[:query]),
+                                      form_model: nil)
+      update_main_content_via_turbo_stream(
+        groups: [group] + active_groups_for_form,
+        editing_group_key: TEMPORARY_GROUP_KEY,
+        form_model:
+      )
+    end
+
+    def group_form_model(group:, name: group[:name], validation_message: nil)
+      WorkPackageTypes::FormConfiguration::GroupFormModel.from_group(group, name:, validation_message:)
+    end
+  end
+end
diff --git a/app/controllers/work_package_types/form_configuration_tab_controller.rb b/app/controllers/work_package_types/form_configuration_tab_controller.rb
index 3edf8c3b1ef..b094b28b4fd 100644
--- a/app/controllers/work_package_types/form_configuration_tab_controller.rb
+++ b/app/controllers/work_package_types/form_configuration_tab_controller.rb
@@ -30,36 +30,101 @@
 
 module WorkPackageTypes
   class FormConfigurationTabController < BaseTabController
-    include PaginationHelper
+    include TypesHelper
+    include OpTurbo::ComponentStream
+    include WorkPackageTypes::FormConfigurationComponentStreams
 
     layout "admin"
 
-    current_menu_item [:edit, :update] do
+    current_menu_item [:edit, :update, :reset_dialog, :move, :drop, :destroy] do
       :types
     end
 
     def edit; end
 
+    def reset_dialog
+      respond_with_dialog(
+        WorkPackageTypes::FormConfiguration::ResetDialogComponent.new(type: @type)
+      )
+    end
+
     def update
       result = WorkPackageTypes::UpdateService
         .new(user: current_user, model: @type, contract_class: UpdateFormConfigurationContract)
         .call(permitted_type_params)
 
       if result.success?
-        redirect_to edit_type_form_configuration_path(@type), notice: t(:notice_successful_update)
+        respond_to_update_success
       else
-        flash.now[:error] = result.errors[:attribute_groups].to_sentence
-        render :edit, status: :unprocessable_entity
+        respond_to_update_failure(result)
       end
     end
 
+    def move
+      call = ::WorkPackageTypes::FormConfigurationRows::UpdateService
+        .new(user: current_user, type: @type, row_key: row_key_param)
+        .call(move_to: params[:move_to])
+
+      handle_row_update_response(call)
+    end
+
+    def drop
+      call = ::WorkPackageTypes::FormConfigurationRows::UpdateService
+        .new(user: current_user, type: @type, row_key: row_key_param)
+        .call(target_id: params[:target_id], position: params[:position])
+
+      handle_row_update_response(call)
+    end
+
+    def destroy
+      call = ::WorkPackageTypes::FormConfigurationRows::DeleteService
+        .new(user: current_user, type: @type, row_key: row_key_param)
+        .call
+
+      handle_row_update_response(call)
+    end
+
     private
 
+    def respond_to_update_success
+      respond_to do |format|
+        format.html { redirect_to edit_type_form_configuration_path(@type), notice: t(:notice_successful_update) }
+        format.turbo_stream do
+          update_form_configuration_via_turbo_stream
+          respond_with_turbo_streams
+        end
+      end
+    end
+
+    def respond_to_update_failure(result)
+      respond_to do |format|
+        format.html do
+          flash.now[:error] = result.errors[:attribute_groups].to_sentence
+          render :edit, status: :unprocessable_entity
+        end
+        format.turbo_stream { head :unprocessable_entity }
+      end
+    end
+
+    def handle_row_update_response(call)
+      if call.success?
+        update_form_configuration_via_turbo_stream
+      else
+        render_form_configuration_error(call)
+      end
+
+      respond_with_turbo_streams(status: call.success? ? :ok : :unprocessable_entity)
+    end
+
     def find_type
       @type = ::Type.includes(:projects, :custom_fields).find(params[:type_id])
       show_error_not_found unless @type
     end
 
+    def row_key_param
+      params[:row_key] || params[:id]
+    end
+
     def permitted_type_params
       # having to call #to_unsafe_h as a query hash the attribute_groups
       # parameters would otherwise still be an ActiveSupport::Parameter
diff --git a/app/controllers/work_packages_controller.rb b/app/controllers/work_packages_controller.rb
index ad87a9bc100..8de18e280e5 100644
--- a/app/controllers/work_packages_controller.rb
+++ b/app/controllers/work_packages_controller.rb
@@ -286,7 +286,7 @@ class WorkPackagesController < ApplicationController
   end
 
   def login_back_url_params
-    params.permit(:query_id, :state, :query_props)
+    params.permit(:query_id, :state, :query_props, :type, :parent_id)
   end
 
   def redirect_to_complete_route
diff --git a/app/forms/work_package_types/form_configuration/group_form.rb b/app/forms/work_package_types/form_configuration/group_form.rb
new file mode 100644
index 00000000000..cee1676e6f4
--- /dev/null
+++ b/app/forms/work_package_types/form_configuration/group_form.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class GroupForm < ApplicationForm
+      form do |group_form|
+        group_form.hidden(name: :group_type, value: model.group_type)
+        group_form.hidden(name: :query, value: model.query) if model.query.present?
+
+        group_form.group(layout: :horizontal) do |row|
+          row.text_field(
+            name: :name,
+            label: I18n.t("types.edit.form_configuration.group_name_label"),
+            visually_hide_label: true,
+            value: model.name,
+            required: true,
+            autofocus: true,
+            autocomplete: "off",
+            validation_message: validation_message_for(:name),
+            data: { "test-selector": "type-form-configuration-group-name-input" }
+          )
+          row.button(
+            name: :cancel,
+            tag: :a,
+            label: I18n.t("button_cancel"),
+            scheme: :secondary,
+            href: @cancel_path,
+            data: {
+              turbo_method: :post,
+              turbo_stream: true
+            },
+            test_selector: "type-form-configuration-group-cancel"
+          )
+          row.submit(
+            name: :submit,
+            label: I18n.t("button_save"),
+            scheme: :primary,
+            test_selector: "type-form-configuration-group-save"
+          )
+        end
+      end
+
+      def initialize(cancel_path:)
+        super()
+        @cancel_path = cancel_path
+      end
+
+      private
+
+      def validation_message_for(attribute)
+        model.errors.messages_for(attribute).to_sentence.presence
+      end
+    end
+  end
+end
diff --git a/app/helpers/types_helper.rb b/app/helpers/types_helper.rb
index 922a63eec72..9ade9394193 100644
--- a/app/helpers/types_helper.rb
+++ b/app/helpers/types_helper.rb
@@ -136,13 +136,12 @@ module ::TypesHelper
   def get_active_groups(type, available, inactive)
     type.attribute_groups.map do |group|
       {
+        key: group.key,
         type: group.group_type,
         name: group.translated_key,
         attributes: active_group_attributes_map(group, available, inactive),
         query: query_to_query_props(group)
-      }.tap do |group_obj|
-        group_obj[:key] = group.key if group.internal_key?
-      end
+      }
     end
   end
 
diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb
index 9a1d0ddd663..4011e03baac 100644
--- a/app/helpers/work_packages_helper.rb
+++ b/app/helpers/work_packages_helper.rb
@@ -35,9 +35,9 @@ module WorkPackagesHelper
   # Displays a link to +work_package+ with its subject.
   # Examples:
   #
-  #   link_to_work_package(package)                            # => Defect #6: This is the subject
-  #   link_to_work_package(package, link_subject: true)        # => Defect #6: This is the subject (everything within the link)
-  #   link_to_work_package(package, display_project: true)     # => Foo - Defect #6: This is the subject
+  #   link_to_work_package(package)                            # => Defect <id>: This is the subject
+  #   link_to_work_package(package, link_subject: true)        # => Defect <id>: This is the subject (everything within the link)
+  #   link_to_work_package(package, display_project: true)     # => Foo - Defect <id>: This is the subject
   def link_to_work_package(work_package, display_project: false, link_subject: false) # rubocop:disable Metrics/AbcSize
     output = ActiveSupport::SafeBuffer.new
     output << "#{work_package.project} - " if display_project && work_package.project_id
@@ -47,7 +47,7 @@ module WorkPackagesHelper
                    class: link_to_work_package_css_classes(work_package)) do
       link_parts = []
       link_parts << work_package.type.to_s if work_package.type_id
-      link_parts << "##{work_package.id}:"
+      link_parts << "#{work_package.formatted_id}:"
       link_parts << content_tag(:span, I18n.t(:label_closed_work_packages), class: "sr-only") if work_package.closed?
       link_parts << work_package.subject if link_subject
 
diff --git a/app/models/exports/pdf/common/common.rb b/app/models/exports/pdf/common/common.rb
index 5d17e963970..fed4754959e 100644
--- a/app/models/exports/pdf/common/common.rb
+++ b/app/models/exports/pdf/common/common.rb
@@ -428,9 +428,9 @@ module Exports::PDF::Common::Common
     "<color rgb='#{styles.link_color}'>#{make_link_href(href, caption)}</color>"
   end
 
-  def get_id_column_cell(work_package, value)
+  def get_id_column_cell(work_package)
     href = url_helpers.work_package_url(work_package)
-    make_link_href_cell(href, value)
+    make_link_href_cell(href, work_package.display_id)
   end
 
   def get_subject_column_cell(work_package, value)
@@ -469,7 +469,7 @@ module Exports::PDF::Common::Common
   def get_value_cell_by_column(work_package, column_name, format_subject)
     value = get_column_value(work_package, column_name)
     return get_cf_link_cell(value) if value.is_a?(::Exports::Formatters::LinkFormatter)
-    return get_id_column_cell(work_package, value) if column_name == :id
+    return get_id_column_cell(work_package) if column_name == :id
     return get_subject_column_cell(work_package, value) if format_subject && column_name == :subject
 
     escape_tags(value)
diff --git a/app/models/exports/pdf/common/markdown.rb b/app/models/exports/pdf/common/markdown.rb
index 6121610f74d..197ef474e11 100644
--- a/app/models/exports/pdf/common/markdown.rb
+++ b/app/models/exports/pdf/common/markdown.rb
@@ -35,6 +35,7 @@ module Exports::PDF::Common::Markdown
     include MarkdownToPDF::Core
     include MarkdownToPDF::Parser
     include Exports::PDF::Common::Common
+    include Exports::PDF::Common::WorkPackageMentions
 
     def initialize(styling_yml, pdf, hyphenation_language)
       @styles = MarkdownToPDF::Styles.new(styling_yml)
@@ -94,45 +95,14 @@ module Exports::PDF::Common::Markdown
       wp_mention_macro(tag.attr("data-text") || "", tag.attr("data-id") || "", opts)
     end
 
-    def expand_wp_mention(work_package, content)
-      detail_level = content.count("#")
-      return content if detail_level == 1
-
-      # ##1234: {Type} #{ID}: {Subject}
-      content = "#{work_package.type} ##{work_package.id}: #{work_package.subject}"
-      return content if detail_level == 2
-
-      # ###1234: {Status} {Type} #{ID}: {Subject} ({Start Date} - {End Date})
-      "#{work_package.status.name} #{content}#{work_package_dates(work_package)}"
-    end
-
     def wp_mention_macro(content, id, opts)
-      id = id[/\d+/]
       return [text_hash(content, opts)] if id.blank?
 
-      work_package = WorkPackage.find_by(id: id)
+      work_package = WorkPackage.find_by_display_id(id)
       return [text_hash(content, opts)] unless work_package&.visible?
 
       content = expand_wp_mention(work_package, content)
-      [text_hash(content, opts.merge({ link: url_helpers.work_package_url(id) }))]
-    end
-
-    def work_package_dates(work_package)
-      return "" if work_package.start_date.blank? && work_package.due_date.blank?
-
-      if work_package.due_date.present? && work_package.start_date == work_package.due_date
-        return " (#{format_date(work_package.due_date)})"
-      end
-
-      work_package_date_range(work_package)
-    end
-
-    def work_package_date_range(work_package)
-      content = [
-        work_package.start_date.present? ? format_date(work_package.start_date) : I18n.t("label_no_start_date"),
-        work_package.due_date.present? ? format_date(work_package.due_date) : I18n.t("label_no_due_date")
-      ].join(" - ")
-      " (#{content})"
+      [text_hash(content, opts.merge({ link: url_helpers.work_package_url(work_package) }))]
     end
 
     def handle_mention_html_tag(tag, node, opts)
diff --git a/app/models/exports/pdf/common/work_package_mentions.rb b/app/models/exports/pdf/common/work_package_mentions.rb
new file mode 100644
index 00000000000..06db3a0a7b1
--- /dev/null
+++ b/app/models/exports/pdf/common/work_package_mentions.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Exports::PDF::Common::WorkPackageMentions
+  include Redmine::I18n
+
+  def expand_wp_mention(work_package, content)
+    detail_level = content.count("#")
+    return work_package.formatted_id if detail_level == 1
+
+    # ##: {Type} {formatted_id}: {Subject}
+    content = "#{work_package.type} #{work_package.formatted_id}: #{work_package.subject}"
+    return content if detail_level == 2
+
+    # ###: {Status} {Type} {formatted_id}: {Subject} ({Start Date} - {End Date})
+    "#{work_package.status.name} #{content}#{work_package_dates(work_package)}"
+  end
+
+  def work_package_dates(work_package)
+    return "" if work_package.start_date.blank? && work_package.due_date.blank?
+
+    if work_package.due_date.present? && work_package.start_date == work_package.due_date
+      return " (#{format_date(work_package.due_date)})"
+    end
+
+    work_package_date_range(work_package)
+  end
+
+  def work_package_date_range(work_package)
+    content = [
+      work_package.start_date.present? ? format_date(work_package.start_date) : I18n.t("label_no_start_date"),
+      work_package.due_date.present? ? format_date(work_package.due_date) : I18n.t("label_no_due_date")
+    ].join(" - ")
+    " (#{content})"
+  end
+end
diff --git a/app/models/exports/pdf/components/gantt/gantt_builder.rb b/app/models/exports/pdf/components/gantt/gantt_builder.rb
index 1d676164a64..aec81b947f0 100644
--- a/app/models/exports/pdf/components/gantt/gantt_builder.rb
+++ b/app/models/exports/pdf/components/gantt/gantt_builder.rb
@@ -742,7 +742,7 @@ module Exports::PDF::Components::Gantt
     # @param [WorkPackage] work_package
     # @return [String]
     def work_package_info_line(work_package)
-      "#{work_package.type} ##{work_package.id} • #{work_package.status} • #{work_package_info_line_date work_package}"
+      "#{work_package.type} #{work_package.formatted_id} • #{work_package.status} • #{work_package_info_line_date work_package}"
     end
 
     def work_package_info_line_date(work_package)
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 89986f8337c..ebebd091bb8 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -59,6 +59,7 @@ class Journal < ApplicationRecord
   register_journal_formatter OpenProject::JournalFormatter::MeetingStartTime
   register_journal_formatter OpenProject::JournalFormatter::MeetingState
   register_journal_formatter OpenProject::JournalFormatter::MeetingWorkPackageId
+  register_journal_formatter OpenProject::JournalFormatter::ParticipantChange
   register_journal_formatter OpenProject::JournalFormatter::ProjectPhaseActive
   register_journal_formatter OpenProject::JournalFormatter::ProjectPhaseDates
   register_journal_formatter OpenProject::JournalFormatter::ProjectPhaseDefinition
@@ -110,6 +111,7 @@ class Journal < ApplicationRecord
   belongs_to :data, polymorphic: true, dependent: :destroy
 
   has_many :agenda_item_journals, class_name: "Journal::MeetingAgendaItemJournal", dependent: :delete_all
+  has_many :participant_journals, class_name: "Journal::MeetingParticipantJournal", dependent: :delete_all
   has_many :attachable_journals, class_name: "Journal::AttachableJournal", dependent: :delete_all
   has_many :customizable_journals, class_name: "Journal::CustomizableJournal", dependent: :delete_all
   has_many :custom_comment_journals, class_name: "Journal::CustomCommentJournal", dependent: :delete_all
@@ -223,12 +225,6 @@ class Journal < ApplicationRecord
     end
   end
 
-  private
-
-  def has_file_links?
-    journable.respond_to?(:file_links)
-  end
-
   def predecessor
     return @predecessor if defined?(@predecessor)
 
@@ -242,4 +238,10 @@ class Journal < ApplicationRecord
                        .first
                    end
   end
+
+  private
+
+  def has_file_links?
+    journable.respond_to?(:file_links)
+  end
 end
diff --git a/app/models/permitted_params.rb b/app/models/permitted_params.rb
index d0a44db3c3a..6934800f519 100644
--- a/app/models/permitted_params.rb
+++ b/app/models/permitted_params.rb
@@ -235,7 +235,7 @@ class PermittedParams
     whitelisted = type_params.permit(*permitted)
 
     if type_params[:attribute_groups]
-      whitelisted[:attribute_groups] = JSON.parse(type_params[:attribute_groups])
+      whitelisted[:attribute_groups] = type_params[:attribute_groups]
     end
 
     whitelisted
diff --git a/app/models/projects/identifier.rb b/app/models/projects/identifier.rb
index 0649ce411cf..c1527cf77c4 100644
--- a/app/models/projects/identifier.rb
+++ b/app/models/projects/identifier.rb
@@ -36,6 +36,10 @@ module Projects::Identifier
   # Classic identifier format: lowercase letters, digits, hyphens, underscores — but not all-numeric.
   CLASSIC_IDENTIFIER_FORMAT = /\A(?!\d+\z)[a-z0-9\-_]+\z/
 
+  # Unanchored shape of a semantic project identifier ("PROJ", "MY_PROJECT_1").
+  # Composed into `WorkPackage::SemanticIdentifier::SEMANTIC_ID_PATTERN`.
+  SEMANTIC_FORMAT = /[A-Z][A-Z0-9_]*/
+
   RESERVED_IDENTIFIERS = %w[new menu queries filters identifier_update_dialog identifier_suggestion].freeze
 
   included do
@@ -43,31 +47,18 @@ module Projects::Identifier
 
     normalizes :identifier, with: OpenProject::RemoveInvisibleCharacters
 
-    # Generators
-    # There are two supported formats:
-    # 1. slug identifiers (e.g. "project_one"), generated by acts_as_url
-    #   * work package ID =  global ID (e.g. "#123")
-    # 2. semantic identifiers (e.g. "PROJ1"), generated by the :generate_semantic_identifier hook
-    #   * work package ID =  {project identifier + dash + project-local sequence number ID} (e.g. "PROJ1-123")
-    acts_as_url :name,
-                url_attribute: :identifier,
-                sync_url: false, # Don't update identifier when name changes
-                only_when_blank: true, # Only generate when identifier not set
-                limit: CLASSIC_IDENTIFIER_MAX_LENGTH,
-                blacklist: RESERVED_IDENTIFIERS,
-                adapter: OpenProject::ActsAsUrl::Adapter::OpActiveRecord, # use a custom adapter able to handle edge cases
-                skip_if: -> { Setting::WorkPackageIdentifier.semantic? }
-
-    # Generate semantic identifier (when in the semantic mode)
-    before_validation :generate_semantic_identifier,
-                      on: :create,
-                      if: -> { Setting::WorkPackageIdentifier.semantic? && identifier.blank? }
+    # Generate identifier from name unless specified
+    before_validation on: :create, if: -> { identifier.blank? && name.present? } do
+      self.identifier = suggest_identifier
+    end
 
+    # Basic mode-agnostic identifier validation
     validates :identifier,
               presence: true,
               uniqueness: { case_sensitive: false },
               if: ->(p) { p.persisted? || p.identifier.present? }
 
+    # Extended validation that runs checks specific to each format (classic & semantic)
     validates :identifier, "projects/identifier" => true, if: :identifier_changed?
 
     friendly_id :identifier, use: %i[finders history], slug_column: :identifier
@@ -75,7 +66,7 @@ module Projects::Identifier
     # FriendlyId::Slugged adds after_validation :unset_slug_if_invalid, which reverts the
     # slug column to its previous value when validation fails. With slug_column: :identifier,
     # this would reset a manually-set identifier back to nil on new records. Since the
-    # identifier is managed by acts_as_url and user input (not FriendlyId's slug generator),
+    # identifier is managed by our own callbacks and user input (not FriendlyId's slug generator),
     # we disable this behaviour entirely.
     # Must be inside `included` to override FriendlyId::Slugged in the MRO.
     def unset_slug_if_invalid; end
@@ -121,6 +112,11 @@ module Projects::Identifier
       FriendlyId::Slug.where(sluggable_type: name).extending(IdentifierSlugScopes)
     end
 
+    # There are two supported formats:
+    # 1. slug identifiers (e.g. "project_one"), generated by ClassicIdentifierSuggestionGenerator
+    #   * work package ID =  global ID (e.g. "#123")
+    # 2. semantic identifiers (e.g. "PROJ1"), generated by ProjectIdentifierSuggestionGenerator
+    #   * work package ID =  {project identifier + dash + project-local sequence number ID} (e.g. "PROJ1-123")
     def suggest_identifier(name, mode: Setting[:work_packages_identifier])
       if mode == Setting::WorkPackageIdentifier::SEMANTIC
         exclude = ProjectIdentifiers::IdentifierAutofix::ProblematicIdentifiers.reserved_identifiers
@@ -137,14 +133,9 @@ module Projects::Identifier
   end
 
   # Override the `validation_context` getter to include the `default_validation_context` when the
-  # context is `:saving_custom_fields`. This is required, because the `acts_as_url` plugin from
-  # `stringex` defines a callback on the `:create` context for initialising the `identifier` field.
-  # Providing a custom context while creating the project, will not execute the callbacks on the
-  # `:create` or `:update` contexts, meaning the identifier will not get initialised.
-  # In order to initialise the identifier, the `default_validation_context` (`:create`, or `:update`)
-  # should be included when validating via the `:saving_custom_fields`. This way every create
-  # or update callback will also be executed alongside the `:saving_custom_fields` callbacks.
-  # This problem does not affect the contextless callbacks, they are always executed.
+  # context is `:saving_custom_fields`. Our identifier-generation callbacks fire on `:create`, so
+  # providing only a custom context would skip them, leaving identifier blank on new records.
+  # Including the default context ensures `:create` callbacks run alongside `:saving_custom_fields`.
   def validation_context
     case Array(super)
     in [*, :saving_custom_fields, *] => context
@@ -154,11 +145,4 @@ module Projects::Identifier
     end
   end
 
-  private
-
-  def generate_semantic_identifier
-    return if name.blank?
-
-    self.identifier = self.class.suggest_identifier(name)
-  end
 end
diff --git a/app/models/queries/users/orders/default_order.rb b/app/models/queries/users/orders/default_order.rb
index 7a30b6e0ae4..64c55796eb0 100644
--- a/app/models/queries/users/orders/default_order.rb
+++ b/app/models/queries/users/orders/default_order.rb
@@ -32,6 +32,6 @@ class Queries::Users::Orders::DefaultOrder < Queries::Orders::Base
   self.model = User
 
   def self.key
-    /\A(id|lastname|firstname|mail|login)\z/
+    /\A(id|lastname|firstname|mail|login|admin|created_at|last_login_on)\z/
   end
 end
diff --git a/app/models/queries/users/selects/default.rb b/app/models/queries/users/selects/default.rb
new file mode 100644
index 00000000000..3a73617063b
--- /dev/null
+++ b/app/models/queries/users/selects/default.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class Queries::Users::Selects::Default < Queries::Selects::Base
+  KEYS = %i[login firstname lastname mail admin created_at last_login_on].freeze
+
+  def self.key
+    /\A(#{Regexp.union(KEYS.map(&:to_s))})\z/
+  end
+
+  def self.all_available
+    KEYS.map { new(it) }
+  end
+
+  def caption
+    User.human_attribute_name(attribute)
+  end
+end
diff --git a/app/models/type/attribute_group.rb b/app/models/type/attribute_group.rb
index 6e742da4a71..bc88702058d 100644
--- a/app/models/type/attribute_group.rb
+++ b/app/models/type/attribute_group.rb
@@ -47,7 +47,8 @@ class Type::AttributeGroup < Type::FormGroup
     other.is_a?(self.class) &&
       key == other.key &&
       type == other.type &&
-      attributes == other.attributes
+      attributes == other.attributes &&
+      display_name == other.display_name
   end
 
   def active_members(project)
diff --git a/app/models/type/attribute_groups.rb b/app/models/type/attribute_groups.rb
index 74bdbcef5dd..9277c83d50c 100644
--- a/app/models/type/attribute_groups.rb
+++ b/app/models/type/attribute_groups.rb
@@ -190,14 +190,15 @@ module Type::AttributeGroups
       attributes = group[1]
       first_attribute = attributes[0]
       key = group[0]
+      display_name = group[2] if group.length > 2
 
       if first_attribute.is_a?(Query)
-        new_query_group(key, first_attribute)
+        new_query_group(key, first_attribute, display_name:)
       elsif first_attribute.is_a?(Symbol) && Type::QueryGroup.query_attribute?(first_attribute)
         query = Query.find_by(id: Type::QueryGroup.query_attribute_id(first_attribute))
-        new_query_group(key, query)
+        new_query_group(key, query, display_name:)
       else
-        new_attribute_group(key, attributes)
+        new_attribute_group(key, attributes, display_name:)
       end
     end
   end
@@ -213,16 +214,18 @@ module Type::AttributeGroups
                    else
                      group.attributes
                    end
-      [group.key, attributes]
+      result = [group.key, attributes]
+      result << group.display_name if group.display_name.present?
+      result
     end
   end
 
-  def new_attribute_group(key, attributes)
-    Type::AttributeGroup.new(self, key, attributes)
+  def new_attribute_group(key, attributes, display_name: nil)
+    Type::AttributeGroup.new(self, key, attributes, display_name:)
   end
 
-  def new_query_group(key, query)
-    Type::QueryGroup.new(self, key, query)
+  def new_query_group(key, query, display_name: nil)
+    Type::QueryGroup.new(self, key, query, display_name:)
   end
 
   def cleanup_query_groups_queries
@@ -231,7 +234,7 @@ module Type::AttributeGroups
     new_groups = self[:attribute_groups]
     old_groups = attribute_groups_was
 
-    ids = (old_groups.map(&:last).flatten - new_groups.map(&:last).flatten)
+    ids = (old_groups.map { |g| g[1] }.flatten - new_groups.map { |g| g[1] }.flatten)
           .filter_map { |k| ::Type::QueryGroup.query_attribute_id(k) }
 
     Query.where(id: ids).destroy_all
diff --git a/app/models/type/form_group.rb b/app/models/type/form_group.rb
index dbdb95d27af..115447c80d1 100644
--- a/app/models/type/form_group.rb
+++ b/app/models/type/form_group.rb
@@ -31,12 +31,27 @@
 class Type::FormGroup
   attr_accessor :key,
                 :attributes,
-                :type
+                :type,
+                :display_name
 
-  def initialize(type, key, attributes)
+  def self.next_untitled_key(seen_keys)
+    base_name = I18n.t("types.edit.form_configuration.untitled_group")
+    candidate = base_name
+    suffix = 2
+
+    while seen_keys.include?(candidate)
+      candidate = "#{base_name} #{suffix}"
+      suffix += 1
+    end
+
+    candidate
+  end
+
+  def initialize(type, key, attributes, display_name: nil)
     self.key = key
     self.attributes = attributes
     self.type = type
+    self.display_name = display_name
   end
 
   ##
@@ -49,10 +64,14 @@ class Type::FormGroup
   # Translate the given attribute group if its internal
   # (== if it's a symbol)
   def translated_key
-    if internal_key?
+    if display_name.present?
+      display_name
+    elsif internal_key?
       I18n.t(Type.default_groups[key], default: key.to_s)
-    else
+    elsif key.present?
       key
+    else
+      I18n.t("types.edit.form_configuration.untitled_group")
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 5ccc10b72d8..eb2a27050c7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -112,6 +112,18 @@ class User < Principal
   has_many :reminders, foreign_key: "creator_id", dependent: :destroy, inverse_of: :creator
   has_many :remote_identities, dependent: :destroy
 
+  # Resource allocations assigned to this user. Normal user-deletion goes
+  # through Principals::DeleteJob, which rewrites principal_id to a
+  # DeletedUser placeholder before destroy fires (registered in the
+  # resource_management engine). The `dependent: :nullify` here is a
+  # defensive fallback if a user is destroyed outside that flow — the column
+  # is already nullable for the unassigned/filter-only state.
+  has_many :resource_allocations,
+           class_name: "ResourceAllocation",
+           foreign_key: :principal_id,
+           dependent: :nullify,
+           inverse_of: :principal
+
   # Users blocked via brute force prevention
   # use lambda here, so time is evaluated on each query
   scope :blocked, -> { create_blocked_scope(self, true) }
diff --git a/app/models/user_queries/static.rb b/app/models/user_queries/static.rb
new file mode 100644
index 00000000000..e1293d55284
--- /dev/null
+++ b/app/models/user_queries/static.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class UserQueries::Static
+  DEFAULT = "active"
+
+  class << self
+    def query(id)
+      case id
+      when DEFAULT, nil
+        static_query_active
+      end
+    end
+
+    private
+
+    def static_query_active
+      UserQuery.new(name: I18n.t(:status_active)) do |query|
+        query.where("status", "=", "active")
+        query.select(*Queries::Users::Selects::Default::KEYS, add_not_existing: false)
+        query.clear_changes_information
+      end
+    end
+  end
+end
diff --git a/app/models/user_query.rb b/app/models/user_query.rb
index 19c4c32ce60..abebfac7a20 100644
--- a/app/models/user_query.rb
+++ b/app/models/user_query.rb
@@ -29,13 +29,15 @@
 #++
 
 class UserQuery < PersistedQuery
+  scope :visible, ->(user = User.current) { where(principal: user) }
+
   def self.model
     User
   end
 
   def default_scope
     # Excludes the SystemUser, DeletedUser, AnonymousUser STI descendants of User.
-    User.user
+    User.user.visible
   end
 
   register_query do
@@ -52,6 +54,7 @@ class UserQuery < PersistedQuery
     order Queries::Users::Orders::GroupOrder
     order Queries::Users::Orders::CustomFieldOrder
 
+    select Queries::Users::Selects::Default
     select Queries::Users::Selects::CustomField
   end
 end
diff --git a/app/models/work_package.rb b/app/models/work_package.rb
index bb8057560ed..d4a110bbdd4 100644
--- a/app/models/work_package.rb
+++ b/app/models/work_package.rb
@@ -276,7 +276,7 @@ class WorkPackage < ApplicationRecord
   end
 
   def to_s
-    "#{type.name unless type.is_standard} ##{id}: #{subject}"
+    "#{type.name unless type.is_standard} #{formatted_id}: #{subject}"
   end
 
   def infoline(show_standard_type: true)
diff --git a/app/models/work_package/pdf_export/document_generator.rb b/app/models/work_package/pdf_export/document_generator.rb
index 24ff567ad66..e9bf70d064e 100644
--- a/app/models/work_package/pdf_export/document_generator.rb
+++ b/app/models/work_package/pdf_export/document_generator.rb
@@ -83,7 +83,7 @@ class WorkPackage::PDFExport::DocumentGenerator < Exports::Exporter
   def title
     # <project>_<type>_<ID>_<subject><YYYY-MM-DD>_<HH-MM>.pdf
     build_pdf_filename([work_package.project, work_package.type,
-                        "##{work_package.id}", work_package.subject].join("_"))
+                        work_package.display_id, work_package.subject].join("_"))
   end
 
   def with_images?
diff --git a/app/models/work_package/pdf_export/generator/generator.rb b/app/models/work_package/pdf_export/generator/generator.rb
index aaf20aa824d..f199aa22031 100644
--- a/app/models/work_package/pdf_export/generator/generator.rb
+++ b/app/models/work_package/pdf_export/generator/generator.rb
@@ -36,6 +36,7 @@ module WorkPackage::PDFExport::Generator::Generator
     include MarkdownToPDF::Core
     include MarkdownToPDF::Parser
     include MarkdownToPDF::StyleSchema
+    include Exports::PDF::Common::WorkPackageMentions
 
     def initialize(styling_yml)
       symbol_yml = symbolize(styling_yml)
@@ -94,17 +95,40 @@ module WorkPackage::PDFExport::Generator::Generator
       @hyphens.hyphenate(text)
     end
 
+    def handle_wp_mention_html_tag(tag, node, opts)
+      # <mention class="mention" data-id="185" data-type="work_package" data-text="#185">#185</mention>
+      # <mention class="mention" data-id="185" data-type="work_package" data-text="##185">##185</mention>
+      # <mention class="mention" data-id="185" data-type="work_package" data-text="###185">###185</mention>
+      next_node = node&.next
+      if next_node && next_node.type == :text && next_node.respond_to?(:string_content)
+        next_node.string_content = ""
+      end
+      render_wp_mention(tag.attr("data-text") || "", tag.attr("data-id") || "", opts)
+    end
+
+    def render_wp_mention(content, id, opts)
+      return [text_hash(content, opts)] if id.blank?
+
+      work_package = WorkPackage.find_by_display_id(id)
+      return [text_hash(content, opts)] unless work_package&.visible?
+
+      [text_hash(expand_wp_mention(work_package, content), opts)]
+    end
+
     def handle_mention_html_tag(tag, node, opts)
-      if tag.text.blank?
-        # <mention class="mention" data-id="46012" data-type="work_package" data-text="#46012"></mention>
+      if tag.attr("data-type") == "work_package"
+        handle_wp_mention_html_tag(tag, node, opts)
+      elsif tag.text.blank?
         # <mention class="mention" data-id="3" data-type="user" data-text="@Some User">
         text = tag.attr("data-text")
         if text.present? && !node.next.respond_to?(:string_content) && node.next.string_content != text
           return [text_hash(text, opts)]
         end
+        []
+      else
+        # <mention class="mention" data-id="3" data-type="user" data-text="@Some User">@Some User</mention>
+        []
       end
-      # <mention class="mention" data-id="3" data-type="user" data-text="@Some User">@Some User</mention>
-      []
     end
 
     def handle_unknown_inline_html_tag(tag, node, opts)
diff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rb
index 541dcb1203a..ebb0759a769 100644
--- a/app/models/work_package/pdf_export/work_package_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb
@@ -108,7 +108,7 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter
   end
 
   def heading
-    "#{work_package.type} ##{work_package.id} - #{work_package.subject}"
+    "#{work_package.type} #{work_package.formatted_id} - #{work_package.subject}"
   end
 
   def footer_title
@@ -118,7 +118,7 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter
   def title
     # <project>_<type>_<ID>_<subject><YYYY-MM-DD>_<HH-MM>.pdf
     build_pdf_filename([work_package.project, work_package.type,
-                        "##{work_package.id}", work_package.subject].join("_"))
+                        work_package.display_id, work_package.subject].join("_"))
   end
 
   def write_description!(work_package)
diff --git a/app/models/work_package/semantic_identifier.rb b/app/models/work_package/semantic_identifier.rb
index a1608d74860..7346676c69c 100644
--- a/app/models/work_package/semantic_identifier.rb
+++ b/app/models/work_package/semantic_identifier.rb
@@ -31,10 +31,15 @@
 module WorkPackage::SemanticIdentifier
   extend ActiveSupport::Concern
 
+  # Semantic-identifier shape ("PROJ-42"). Use this when the numeric and
+  # semantic branches need different boundary rules; use `ID_ROUTE_CONSTRAINT`
+  # when both branches share one regex.
+  SEMANTIC_ID_PATTERN = /#{Projects::Identifier::SEMANTIC_FORMAT.source}-\d+/
+
   # Matches either a numeric ID ("12345") or a semantic identifier ("PROJ-42").
   # Used in Rails route constraints so both forms are accepted in URLs.
   # The frontend equivalent lives in WP_ID_URL_PATTERN (work-package-id-pattern.ts).
-  ID_ROUTE_CONSTRAINT = /\d+|[A-Z][A-Z0-9_]*-\d+/
+  ID_ROUTE_CONSTRAINT = /\d+|#{SEMANTIC_ID_PATTERN.source}/
 
   # Raised when a finder is invoked in a way that cannot resolve a semantic
   # identifier — e.g. find_by(id: "PROJ-42") which reduces to a raw SQL
@@ -79,6 +84,41 @@ module WorkPackage::SemanticIdentifier
     end
   end
 
+  # Returns true when value looks like a semantic work package identifier
+  # ("PROJ-42"). Non-strings (Integer, Hash, nil, Array), empty and numeric strings
+  # ("123", " 456 ", "  ") return false — these fall through to standard PK lookup.
+  #
+  # The round-trip check (rather than a regex) is intentional for performance.
+  # Every value that reaches a work-package finder either parses as an integer
+  # or doesn't, and that's enough to dispatch correctly. Don't tighten it.
+  def self.semantic_id?(value)
+    return false unless value.is_a?(String)
+
+    stripped = value.strip
+    return false if stripped.empty?
+
+    stripped.to_i.to_s != stripped
+  end
+
+  # Returns true when value is a canonical numeric ID —
+  # an Integer, or a String that round-trips through `to_i.to_s` ("0", "123").
+  # Rejects leading-zero strings ("0123"), non-numeric strings, empty strings and nil.
+  #
+  # A numeric ID is always a routable primary key; a semantic ID is always
+  # routed through the identifier/alias path. Anything else — nil, blank
+  # strings, Hashes, Arrays — is neither, and both predicates return false
+  # so the caller short-circuits before any lookup.
+  def self.numeric_id?(value)
+    case value
+    when Integer then true
+    when String
+      return false if value.strip.blank?
+
+      !semantic_id?(value)
+    else false
+    end
+  end
+
   # Returns the user-facing identifier for this work package.
   # In semantic mode: the project-based identifier (e.g. "PROJ-42")
   # In classic mode: the numeric database ID
diff --git a/app/models/work_package/semantic_identifier/finder_methods.rb b/app/models/work_package/semantic_identifier/finder_methods.rb
index d03c7904b8e..d8557760fb9 100644
--- a/app/models/work_package/semantic_identifier/finder_methods.rb
+++ b/app/models/work_package/semantic_identifier/finder_methods.rb
@@ -110,8 +110,13 @@ module WorkPackage::SemanticIdentifier::FinderMethods
   # historical alias matches one of the supplied display ids. Numeric and
   # semantic strings may be freely mixed; unknown values produce no match
   # rather than poisoning the rest of the set.
-  def where_display_id_in(values)
-    values = Array(values).map(&:to_s)
+  #
+  # @param values [String, Integer, Array<String, Integer>] one or more
+  #   display ids. Pass scalars (`where_display_id_in("PROJ-1")`), varargs
+  #   (`where_display_id_in("PROJ-1", "PROJ-2")`), or a pre-built array
+  #   (`where_display_id_in(ids)`) interchangeably.
+  def where_display_id_in(*values)
+    values = values.flatten(1).compact_blank.map(&:to_s)
     return none if values.empty?
 
     semantic, numeric = values.partition { semantic_id?(it) }
@@ -152,14 +157,8 @@ module WorkPackage::SemanticIdentifier::FinderMethods
     end
   end
 
-  # Returns true when value looks like a semantic work package identifier (e.g. "PROJ-42").
-  # Non-string values (Integer, Hash, nil, Array) and numeric strings ("123", " 456 ")
-  # return false — these fall through to standard ActiveRecord lookup.
   def semantic_id?(value)
-    return false unless value.is_a?(String)
-
-    stripped = value.strip
-    stripped.to_i.to_s != stripped
+    WorkPackage::SemanticIdentifier.semantic_id?(value)
   end
 
   def find_by_semantic_identifier(identifier)
diff --git a/app/models/work_package_types/form_configuration/group_form_model.rb b/app/models/work_package_types/form_configuration/group_form_model.rb
new file mode 100644
index 00000000000..b0217d17a7e
--- /dev/null
+++ b/app/models/work_package_types/form_configuration/group_form_model.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    class GroupFormModel
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Tableless
+
+      attribute :name, :string
+      attribute :group_type, :string
+      attribute :query, :string
+      attribute :key, :string
+      attribute :temporary, :boolean, default: false
+
+      def self.model_name
+        ActiveModel::Name.new(self, nil, "Group")
+      end
+
+      def self.from_group(group, name: group[:name], validation_message: nil)
+        new(
+          name:,
+          group_type: group[:type],
+          query: group[:query],
+          key: group[:key],
+          temporary: group[:temporary]
+        ).tap do |form_model|
+          form_model.errors.add(:name, validation_message) if validation_message.present?
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/journals/create_service.rb b/app/services/journals/create_service.rb
index 7f9650795af..7e73dc95095 100644
--- a/app/services/journals/create_service.rb
+++ b/app/services/journals/create_service.rb
@@ -566,7 +566,9 @@ module Journals
     end
 
     def within_aggregation_time?(predecessor)
-      predecessor.updated_at >= (Time.zone.now - Setting.journal_aggregation_time_minutes.to_i.minutes)
+      minutes = journable.class.try(:journal_aggregation_time_minutes) ||
+                Setting.journal_aggregation_time_minutes.to_i
+      predecessor.updated_at >= (Time.zone.now - minutes.minutes)
     end
 
     def same_user?(predecessor)
diff --git a/app/services/project_identifiers/classic_identifier_suggestion_generator.rb b/app/services/project_identifiers/classic_identifier_suggestion_generator.rb
index ca74eea1687..f4513d2e513 100644
--- a/app/services/project_identifiers/classic_identifier_suggestion_generator.rb
+++ b/app/services/project_identifiers/classic_identifier_suggestion_generator.rb
@@ -29,12 +29,13 @@
 #++
 
 module ProjectIdentifiers
-  # Generates a unique classic-format (acts_as_url-style) identifier from a project name,
-  # mirroring acts_as_url's own duplicate loop: appends -1, -2, … until a free slug is found.
+  # Generates a unique classic-format identifier from a project name.
+  # Appends -1, -2, … until a free slug is found.
   #
   # Instantiate once to load the taken-identifier set from the DB, then call +suggest_identifier+.
   class ClassicIdentifierSuggestionGenerator
     FALLBACK_BASE = "project"
+    BLANK_SLUG_SUBSTITUTIONS = { "." => "dot", "!" => "bang" }.freeze
 
     def initialize(project: nil)
       @exclude = taken_identifiers(project:)
@@ -49,9 +50,9 @@ module ProjectIdentifiers
              .find { |slug| Project.classic_identifier_format?(slug) }
     end
 
-    # Generates a unique classic-format identifier from +name+, mirroring acts_as_url's
-    # duplicate loop: appends -1, -2, … until a slug not in the taken set is found.
-    # Falls back to a randomised +FALLBACK_BASE+ slug when +name+ produces a blank slug.
+    # Generates a unique classic-format identifier from +name+.
+    # Appends -1, -2, … until a slug not in the taken set is found.
+    # Falls back to a randomised +FALLBACK_BASE+ slug when +name+ produces no valid slug.
     def suggest_identifier(name)
       base = slugify(name) || fallback_base
 
@@ -68,7 +69,9 @@ module ProjectIdentifiers
     private
 
     def slugify(name)
-      name.to_url.first(Projects::Identifier::CLASSIC_IDENTIFIER_MAX_LENGTH).presence
+      slug = name.to_url.first(Projects::Identifier::CLASSIC_IDENTIFIER_MAX_LENGTH).presence
+      slug ||= BLANK_SLUG_SUBSTITUTIONS[name]
+      slug if slug && Projects::Identifier::CLASSIC_IDENTIFIER_FORMAT.match?(slug)
     end
 
     def fallback_base
diff --git a/app/services/project_identifiers/convert_project_to_semantic_service.rb b/app/services/project_identifiers/convert_project_to_semantic_service.rb
index 788f120665f..226c2fe9515 100644
--- a/app/services/project_identifiers/convert_project_to_semantic_service.rb
+++ b/app/services/project_identifiers/convert_project_to_semantic_service.rb
@@ -80,8 +80,11 @@ module ProjectIdentifiers
       raise "Generated identifier is blank for project #{project.id}" if new_identifier.blank?
 
       project.identifier = new_identifier
-      # Save with the validation context that allows to save semantic ID while system is in classic mode
-      project.save!(context: :semantic_conversion)
+      # Save with the validation context that allows to save semantic ID while system is in classic mode.
+      # Suppress notifications: this is a background system operation, not a user edit.
+      Journal::NotificationConfiguration.with(false) do
+        project.save!(context: :semantic_conversion)
+      end
     end
 
     def reset_stale_identifiers
diff --git a/app/services/project_identifiers/revert_project_to_classic_service.rb b/app/services/project_identifiers/revert_project_to_classic_service.rb
index 7a1045d574e..718d3321409 100644
--- a/app/services/project_identifiers/revert_project_to_classic_service.rb
+++ b/app/services/project_identifiers/revert_project_to_classic_service.rb
@@ -53,7 +53,10 @@ module ProjectIdentifiers
     def restore_classic_identifier
       generator = ProjectIdentifiers::ClassicIdentifierSuggestionGenerator.new
       classic = generator.restore_identifier(project) || generator.suggest_identifier(project.name)
-      project.update!(identifier: classic)
+      # Suppress notifications: this is a background system operation, not a user edit.
+      Journal::NotificationConfiguration.with(false) do
+        project.update!(identifier: classic)
+      end
     end
   end
 end
diff --git a/app/services/user_queries/set_attributes_service.rb b/app/services/user_queries/set_attributes_service.rb
new file mode 100644
index 00000000000..88140e9e56c
--- /dev/null
+++ b/app/services/user_queries/set_attributes_service.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class UserQueries::SetAttributesService < BaseServices::SetAttributes
+  private
+
+  def set_attributes(params)
+    set_filters(params.delete(:filters))
+    set_order(params.delete(:orders))
+    set_select(params.delete(:selects))
+
+    super
+  end
+
+  def set_default_attributes(_params)
+    set_default_selects
+  end
+
+  def set_default_selects
+    return if model.selects.any?
+
+    model.select(*Queries::Users::Selects::Default::KEYS, add_not_existing: false)
+  end
+
+  def set_filters(filters)
+    return unless filters
+
+    model.filters.clear
+    filters.each do |filter|
+      model.where(filter[:attribute], filter[:operator], filter[:values])
+    end
+  end
+
+  def set_select(selects)
+    return unless selects
+
+    model.selects.clear
+    model.select(*selects, add_not_existing: false)
+  end
+
+  def set_order(orders)
+    return unless orders
+
+    model.orders.clear
+    model.order(orders.to_h { |o| [o[:attribute], o[:direction]] })
+  end
+end
diff --git a/app/services/work_package_types/attribute_groups/transformer.rb b/app/services/work_package_types/attribute_groups/transformer.rb
index e367cdc70b6..b9e2d9ecd8e 100644
--- a/app/services/work_package_types/attribute_groups/transformer.rb
+++ b/app/services/work_package_types/attribute_groups/transformer.rb
@@ -37,15 +37,23 @@ module WorkPackageTypes
       end
 
       def call
-        return [] if groups.blank?
+        return ServiceResult.success(result: []) if groups.blank?
 
-        groups.map do |group|
-          if group[:type] == "query"
-            transform_query_group(group)
-          else
-            transform_attribute_group(group)
-          end
+        transformed_groups = []
+
+        groups.each do |group|
+          transformed_group = if group[:type] == "query"
+                                transform_query_group(group)
+                              else
+                                transform_attribute_group(group)
+                              end
+
+          return transformed_group if transformed_group.is_a?(ServiceResult)
+
+          transformed_groups << transformed_group
         end
+
+        ServiceResult.success(result: transformed_groups)
       end
 
       private
@@ -53,28 +61,43 @@ module WorkPackageTypes
       attr_reader :groups, :user
 
       def transform_attribute_group(group)
-        name = group[:key]&.to_sym || group[:name]
         attributes = group[:attributes].pluck(:key)
 
-        [name, attributes]
+        return [group[:name], attributes] if group[:key].blank?
+
+        build_default_attribute_group(group, attributes)
       end
 
       def transform_query_group(group)
         name = group[:name]
-        props = JSON.parse(group[:query])
+        result = ::WorkPackageTypes::FormConfiguration::EmbeddedQueryBuilder.build(
+          query_props: group[:query],
+          name: "Embedded table: #{name}",
+          user:
+        )
 
-        query = Query.new_default(name: "Embedded table: #{name}")
-        query.extend(OpenProject::ChangedBySystem)
-        query.change_by_system { query.user = User.system }
+        return result if result.failure?
 
-        result = ::API::V3::UpdateQueryFromV3ParamsService
-          .new(query, user)
-          .call(props.with_indifferent_access)
+        [name, [result.result]]
+      end
 
-        if result.success?
-          query.show_hierarchies = false
-          [name, [query]]
-        end
+      def build_default_attribute_group(group, attributes)
+        key = group[:key].to_sym
+        display_name = customized_display_name(group, key)
+        result = [key, attributes]
+        result << display_name if display_name.present?
+        result
+      end
+
+      def customized_display_name(group, key)
+        return if group[:name].blank?
+
+        group[:name] unless group[:name] == default_group_name(key)
+      end
+
+      def default_group_name(key)
+        label = Type.default_groups[key]
+        label ? I18n.t(label, default: key.to_s) : key.to_s
       end
     end
   end
diff --git a/app/services/work_package_types/form_configuration/concern.rb b/app/services/work_package_types/form_configuration/concern.rb
new file mode 100644
index 00000000000..801cb3f055b
--- /dev/null
+++ b/app/services/work_package_types/form_configuration/concern.rb
@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    module Concern
+      extend ActiveSupport::Concern
+
+      def initialize(user:, type:, **)
+        super()
+        @user = user
+        @type = type
+      end
+
+      private
+
+      attr_reader :type,
+                  :user
+
+      def active_groups
+        type.attribute_groups.reject { |group| group.key.to_s == "__empty" }
+      end
+
+      def find_group(group_key)
+        active_groups.find { |group| group_identifier_match?(group, group_key) }
+      end
+
+      def find_attribute_group(group_key)
+        type.attribute_groups.find do |group|
+          group.group_type == :attribute && group_identifier_match?(group, group_key)
+        end
+      end
+
+      def find_row(row_key)
+        active_groups
+          .select { |group| group.group_type == :attribute }
+          .each do |group|
+            index = group.attributes.index { |attribute| attribute_identifier_match?(attribute, row_key) }
+            return { group:, index: } if index
+          end
+
+        nil
+      end
+
+      def group_identifier_match?(group, identifier)
+        expected = identifier.to_s.strip
+
+        [
+          group.key,
+          group.display_name,
+          group.translated_key
+        ].compact.map { |value| value.to_s.strip }.include?(expected)
+      end
+
+      def attribute_identifier_match?(attribute, identifier)
+        attribute.to_s.strip == identifier.to_s.strip
+      end
+
+      def persist_groups(groups)
+        assign_groups(groups)
+        return contract_failure unless form_configuration_contract.validate
+
+        persist_type
+      end
+
+      def failure_with_message(message)
+        type.errors.clear
+        type.errors.add(:base, message)
+
+        ServiceResult.failure(result: type, errors: type.errors)
+      end
+
+      def build_query(query_props, name:)
+        ::WorkPackageTypes::FormConfiguration::EmbeddedQueryBuilder.build(query_props:, name:, user:)
+      end
+
+      def normalized_groups(groups)
+        groups = groups
+                 .reject { |group| group.key.to_s == "__empty" }
+        seen_keys = groups.filter_map(&:key).compact_blank.map(&:to_s)
+        groups = groups.map { |group| normalize_group(group, seen_keys:) }
+
+        if groups.empty?
+          [::Type::AttributeGroup.new(type, :__empty, [])]
+        else
+          groups
+        end
+      end
+
+      def normalize_group(group, seen_keys:)
+        return group if group.key.present?
+
+        group.key = next_untitled_group_name(seen_keys)
+        group
+      end
+
+      def next_untitled_group_name(seen_keys)
+        Type::FormGroup.next_untitled_key(seen_keys).tap { |key| seen_keys << key }
+      end
+
+      def sync_active_custom_fields!
+        type.custom_field_ids = active_groups
+                                .select { |group| group.group_type == :attribute }
+                                .flat_map(&:members)
+                                .filter_map do |attribute|
+                                  next unless CustomField.custom_field_attribute?(attribute)
+
+                                  attribute.delete_prefix("custom_field_").to_i
+                                end
+                                .uniq
+      end
+
+      def assign_groups(groups)
+        type.attribute_groups_will_change!
+        type.attribute_groups_objects = normalized_groups(groups)
+        sync_active_custom_fields!
+      end
+
+      def form_configuration_contract
+        @form_configuration_contract ||= ::WorkPackageTypes::UpdateFormConfigurationContract.new(type, user, options: {})
+      end
+
+      def contract_failure
+        ServiceResult.failure(result: type, errors: form_configuration_contract.errors)
+      end
+
+      def persist_type
+        if type.save
+          ServiceResult.success(result: type)
+        else
+          ServiceResult.failure(result: type, errors: type.errors)
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/form_configuration/embedded_query_builder.rb b/app/services/work_package_types/form_configuration/embedded_query_builder.rb
new file mode 100644
index 00000000000..2aedb279cf7
--- /dev/null
+++ b/app/services/work_package_types/form_configuration/embedded_query_builder.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfiguration
+    module EmbeddedQueryBuilder
+      module_function
+
+      def build(query_props:, name:, user:)
+        query = Query.new_default(name:)
+        query.filters = []
+        assign_system_user(query)
+
+        query_call = ::API::V3::UpdateQueryFromV3ParamsService
+          .new(query, user)
+          .call(query_parameters(query_props), valid_subset: true)
+
+        return query_call if query_call.failure?
+
+        query.show_hierarchies = false
+        query_call
+      rescue JSON::ParserError
+        invalid_query_result
+      end
+
+      def rebuild(query:, user:)
+        return invalid_query_result if query.nil?
+
+        build(
+          query_props: ::API::V3::Queries::QueryParamsRepresenter.new(query).to_h,
+          name: query.name,
+          user:
+        )
+      end
+
+      def query_parameters(query_props)
+        return {} if query_props.blank?
+        if query_props.is_a?(String)
+          return JSON.parse(query_props).deep_symbolize_keys
+        end
+
+        params = query_props.respond_to?(:to_unsafe_h) ? query_props.to_unsafe_h : query_props
+        params.deep_symbolize_keys
+      end
+
+      def assign_system_user(query)
+        query.extend(OpenProject::ChangedBySystem)
+        query.change_by_system { query.user = User.system }
+      end
+
+      def invalid_query_result
+        errors = Query.new.errors
+        errors.add(:base, I18n.t("types.edit.form_configuration.invalid_query"))
+
+        ServiceResult.failure(errors:)
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/form_configuration_groups/create_service.rb b/app/services/work_package_types/form_configuration_groups/create_service.rb
new file mode 100644
index 00000000000..3ee9937e5fe
--- /dev/null
+++ b/app/services/work_package_types/form_configuration_groups/create_service.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfigurationGroups
+    class CreateService < ::BaseServices::BaseCallable
+      include ::WorkPackageTypes::FormConfiguration::Concern
+
+      def perform
+        name = resolve_group_name
+
+        if query_group?
+          query_call = build_query(params[:query_props], name: "Embedded table: #{name}")
+          return query_call if query_call.failure?
+        end
+
+        group = build_group(name, query_result: query_call&.result)
+
+        groups = active_groups
+        groups.unshift(group)
+
+        persist_groups(groups).tap do |call|
+          call.result = group if call.success?
+        end
+      end
+
+      private
+
+      def resolve_group_name
+        name = params[:name].to_s.strip
+        return name if name.present?
+
+        seen_keys = active_groups.map { |g| g.key.to_s }
+        Type::FormGroup.next_untitled_key(seen_keys)
+      end
+
+      def query_group?
+        params[:group_type].to_s == "query"
+      end
+
+      def build_group(name, query_result: nil)
+        if query_result
+          ::Type::QueryGroup.new(type, name, query_result)
+        else
+          ::Type::AttributeGroup.new(type, name, [])
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/form_configuration_groups/delete_service.rb b/app/services/work_package_types/form_configuration_groups/delete_service.rb
new file mode 100644
index 00000000000..a2851cbdb9e
--- /dev/null
+++ b/app/services/work_package_types/form_configuration_groups/delete_service.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfigurationGroups
+    class DeleteService < ::BaseServices::BaseCallable
+      include ::WorkPackageTypes::FormConfiguration::Concern
+
+      def initialize(user:, type:, group_key:)
+        super(user:, type:)
+        @group_key = group_key
+      end
+
+      def perform
+        group = find_group(@group_key)
+        return failure_with_message(I18n.t("types.edit.form_configuration.not_found")) unless group
+
+        groups = active_groups.reject { |group| group.key.to_s == @group_key.to_s }
+
+        persist_groups(groups).tap do |call|
+          call.result = group if call.success?
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/form_configuration_groups/update_service.rb b/app/services/work_package_types/form_configuration_groups/update_service.rb
new file mode 100644
index 00000000000..b5999b3e37b
--- /dev/null
+++ b/app/services/work_package_types/form_configuration_groups/update_service.rb
@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfigurationGroups
+    class UpdateService < ::BaseServices::BaseCallable
+      include ::WorkPackageTypes::FormConfiguration::Concern
+
+      def initialize(user:, type:, group_key:)
+        super(user:, type:)
+        @group_key = group_key
+      end
+
+      def perform
+        group = find_group(@group_key)
+        return failure_with_message(I18n.t("types.edit.form_configuration.not_found")) unless group
+
+        groups = active_groups
+        update_result = perform_update(group, groups)
+        return update_result if update_result.is_a?(ServiceResult) && update_result.failure?
+
+        persist_groups(groups).tap do |call|
+          call.result = group if call.success?
+        end
+      end
+
+      private
+
+      def perform_update(group, groups)
+        return move_group(groups, move_to: params[:move_to], position: params[:position]) if move_requested?
+        return update_query(group, params[:query_props]) if params[:query_props].present?
+
+        rename_group!(group, params[:name])
+      end
+
+      def move_group(groups, move_to:, position:)
+        current_index = groups.index { |group| group.key.to_s == @group_key.to_s }
+        return if current_index.nil?
+
+        new_index = group_move_index(groups:, current_index:, move_to:, position:)
+
+        groups.insert(new_index, groups.delete_at(current_index)) if new_index != current_index
+      end
+
+      def rename_group!(group, name)
+        stripped_name = name.to_s.strip
+        return blank_name_error if stripped_name.blank?
+
+        rename_group(group, stripped_name)
+        nil
+      end
+
+      def rename_group(group, name)
+        if group.internal_key?
+          group.display_name = name.presence == default_name_for(group) ? nil : name.presence
+        else
+          group.key = name
+          group.display_name = nil
+        end
+      end
+
+      def default_name_for(group)
+        I18n.t(Type.default_groups[group.key], default: group.key.to_s)
+      end
+
+      def move_requested?
+        params[:move_to].present? || params[:position].present?
+      end
+
+      def update_query(group, query_props)
+        query_call = build_query(query_props, name: group.query&.name || "Embedded table: #{@group_key}")
+        return query_call if query_call.failure?
+
+        group.attributes = query_call.result
+        nil
+      end
+
+      def group_move_index(groups:, current_index:, move_to:, position:)
+        return (position.to_i - 1).clamp(0, groups.length - 1) if position.present?
+
+        case move_to&.to_sym
+        when :highest
+          0
+        when :higher
+          [current_index - 1, 0].max
+        when :lower
+          [current_index + 1, groups.length - 1].min
+        when :lowest
+          groups.length - 1
+        else
+          current_index
+        end
+      end
+
+      def blank_name_error
+        failure_with_message(
+          I18n.t("activerecord.errors.models.type.attributes.attribute_groups.group_without_name")
+        )
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/form_configuration_rows/delete_service.rb b/app/services/work_package_types/form_configuration_rows/delete_service.rb
new file mode 100644
index 00000000000..9c4214bc628
--- /dev/null
+++ b/app/services/work_package_types/form_configuration_rows/delete_service.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfigurationRows
+    class DeleteService < ::BaseServices::BaseCallable
+      include ::WorkPackageTypes::FormConfiguration::Concern
+
+      def initialize(user:, type:, row_key:)
+        super(user:, type:)
+        @row_key = row_key
+      end
+
+      def perform
+        row = find_row(@row_key)
+        return failure_with_message(I18n.t("types.edit.form_configuration.not_found")) unless row
+
+        attributes = row[:group].attributes.dup
+        attributes.delete_at(row[:index])
+        row[:group].attributes = attributes
+
+        persist_groups(active_groups).tap do |call|
+          call.result = row[:group] if call.success?
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/form_configuration_rows/update_service.rb b/app/services/work_package_types/form_configuration_rows/update_service.rb
new file mode 100644
index 00000000000..a33f7038e84
--- /dev/null
+++ b/app/services/work_package_types/form_configuration_rows/update_service.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackageTypes
+  module FormConfigurationRows
+    class UpdateService < ::BaseServices::BaseCallable
+      include ::WorkPackageTypes::FormConfiguration::Concern
+
+      INACTIVE_TARGET = "inactive"
+
+      def initialize(user:, type:, row_key:)
+        super(user:, type:)
+        @row_key = row_key
+      end
+
+      def perform
+        return move_row(params[:move_to].to_sym) if move_requested?
+        return drop_row(target_id: params[:target_id], position: params[:position]) if drop_requested?
+
+        failure_with_message(I18n.t("types.edit.form_configuration.not_found"))
+      end
+
+      private
+
+      def move_row(move_to)
+        row = find_row(@row_key)
+        return failure_with_message(I18n.t("types.edit.form_configuration.not_found")) unless row
+
+        update_row_position(row, move_to)
+        persist_group_result(row[:group])
+      end
+
+      def drop_row(target_id:, position:)
+        row = find_row(@row_key)
+
+        return drop_row_to_inactive(row) if inactive_target?(target_id)
+
+        target_group = find_attribute_group(target_id)
+        return failure_with_message(I18n.t("types.edit.form_configuration.not_found")) unless target_group
+
+        move_row_to_target_group(row, target_group, position)
+        persist_group_result(target_group)
+      end
+
+      def row_move_index(move_to, current_index:, size:)
+        case move_to
+        when :highest
+          0
+        when :higher
+          [current_index - 1, 0].max
+        when :lower
+          [current_index + 1, size - 1].min
+        when :lowest
+          size - 1
+        else
+          current_index
+        end
+      end
+
+      def inactive_target?(target_id)
+        target_id.to_s == INACTIVE_TARGET
+      end
+
+      def drop_row_to_inactive(row)
+        remove_row_from_source(row)
+        persist_group_result(row&.dig(:group))
+      end
+
+      def move_requested?
+        params[:move_to].present?
+      end
+
+      def drop_requested?
+        params[:target_id].present?
+      end
+
+      def update_row_position(row, move_to)
+        attributes = row[:group].attributes.dup
+        current_index = row[:index]
+        new_index = row_move_index(move_to, current_index:, size: attributes.length)
+
+        attributes.insert(new_index, attributes.delete_at(current_index)) if new_index != current_index
+        row[:group].attributes = attributes
+      end
+
+      def move_row_to_target_group(row, target_group, position)
+        remove_row_from_source(row)
+        target_attributes = target_group.attributes.dup
+        target_attributes.insert(drop_insert_position(position, target_attributes), @row_key)
+        target_group.attributes = target_attributes
+      end
+
+      def persist_group_result(group)
+        persist_groups(active_groups).tap do |call|
+          call.result = group if call.success?
+        end
+      end
+
+      def remove_row_from_source(row)
+        return unless row
+
+        source_attributes = row[:group].attributes.dup
+        source_attributes.delete_at(row[:index])
+        row[:group].attributes = source_attributes
+      end
+
+      def drop_insert_position(position, target_attributes)
+        [position.to_i - 1, 0].max.clamp(0, target_attributes.length)
+      end
+    end
+  end
+end
diff --git a/app/services/work_package_types/update_service.rb b/app/services/work_package_types/update_service.rb
index cc98f7a8095..36ac8e82429 100644
--- a/app/services/work_package_types/update_service.rb
+++ b/app/services/work_package_types/update_service.rb
@@ -36,7 +36,11 @@ module WorkPackageTypes
 
     def validate_params
       # Only set attribute groups when it exists (Regression #28400)
-      set_attribute_groups(params) if params[:attribute_groups]
+      if params[:attribute_groups]
+        result = set_attribute_groups(params)
+        return result if result.failure?
+      end
+
       set_active_custom_fields
       set_active_custom_fields_for_project_ids(params[:project_ids]) if params[:project_ids].present?
 
@@ -48,14 +52,49 @@ module WorkPackageTypes
     def default_contract_class = UpdateSettingsContract
 
     def set_attribute_groups(params)
-      if params[:attribute_groups].empty?
+      normalize_result = normalize_attribute_groups_param(params[:attribute_groups])
+      return normalize_result if normalize_result.failure?
+
+      assign_result = assign_attribute_groups(normalize_result.result)
+      return assign_result if assign_result.failure?
+
+      params.delete(:attribute_groups)
+      ServiceResult.success(result: model)
+    end
+
+    def normalize_attribute_groups_param(attribute_groups)
+      parsed_groups = case attribute_groups
+                      when String
+                        JSON.parse(attribute_groups)
+                      else
+                        attribute_groups
+                      end
+
+      return invalid_attribute_groups_result unless parsed_groups.is_a?(Array)
+
+      ServiceResult.success(result: parsed_groups.map(&:deep_symbolize_keys))
+    rescue JSON::ParserError
+      invalid_attribute_groups_result
+    end
+
+    def assign_attribute_groups(attribute_groups)
+      if attribute_groups.empty?
         model.reset_attribute_groups
       else
-        # FIXME: We lost the ability to react to errors on the transformation. Might not be a big issue on day to day, but still
-        #   a regression - 2025-08-07 noted by @mereghost
-        model.attribute_groups = AttributeGroups::Transformer.new(groups: params[:attribute_groups], user: user).call
-        params.delete(:attribute_groups)
+        transform_result = AttributeGroups::Transformer.new(groups: attribute_groups, user: user).call
+        return transform_result if transform_result.failure?
+
+        model.attribute_groups = transform_result.result
       end
+
+      ServiceResult.success(result: model)
+    end
+
+    def invalid_attribute_groups_result
+      model.errors.clear
+      model.errors.add(:attribute_groups, I18n.t("types.edit.form_configuration.invalid_attribute_groups"))
+
+      ServiceResult.failure(result: model, errors: model.errors)
     end
 
     ##
diff --git a/app/validators/projects/identifier_validator.rb b/app/validators/projects/identifier_validator.rb
index c1703d68e44..4960a37b9b1 100644
--- a/app/validators/projects/identifier_validator.rb
+++ b/app/validators/projects/identifier_validator.rb
@@ -30,6 +30,9 @@
 
 module Projects
   class IdentifierValidator < ActiveModel::EachValidator
+    # Two anchored patterns, one per rule, so the start-character and body
+    # checks produce distinct error messages. The full unanchored shape
+    # lives at `Projects::Identifier::SEMANTIC_FORMAT`.
     SEMANTIC_START_FORMAT = /\A[A-Z]/
     SEMANTIC_BODY_FORMAT  = /\A[A-Z0-9_]*\z/
 
diff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erb
index 37ad04283f5..f828167737f 100644
--- a/app/views/custom_styles/_primer_color_mapping.erb
+++ b/app/views/custom_styles/_primer_color_mapping.erb
@@ -83,7 +83,6 @@
       --primary-button-color: var(--primary-button-color--dark-mode);
       --button--primary-background-disabled-color: var(--primary-button-color--major1);
       --button--primary-border-disabled-color: var(--primary-button-color--major1);
-      --type-form-conf-attribute--background: var(--overlay-bgColor);
       --select-arrow-bg-color-url: url("data:image/svg+xml;utf8,<svg fill='white' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>");
       --ck-color-mention-text: var(--display-red-fgColor);
       --ck-color-button-on-background: var(--button-default-bgColor-active);
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index d7afd805ede..0e20e0f36b1 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -28,8 +28,8 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <% html_title t(:label_administration), t(:label_user_plural) -%>
 
-<%= render Users::IndexPageHeaderComponent.new %>
+<%= render Users::IndexPageHeaderComponent.new(query: @query) %>
 
-<%= render Users::IndexSubHeaderComponent.new(groups: @groups, status: @status, params: params) %>
+<%= render Users::IndexSubHeaderComponent.new(query: @query) %>
 
-<%= render Users::TableComponent.new(rows: @users, current_user:) %>
+<%= render Users::TableComponent.new(rows: @query, current_user:) %>
diff --git a/app/views/work_package_types/form_configuration_tab/_form.html.erb b/app/views/work_package_types/form_configuration_tab/_form.html.erb
deleted file mode 100644
index 54232eea089..00000000000
--- a/app/views/work_package_types/form_configuration_tab/_form.html.erb
+++ /dev/null
@@ -1,71 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<% form_attributes = form_configuration_groups(@type) %>
-
-<section class="form--section">
-  <div>
-    <div class="grid-block -visible-overflow wrap">
-      <div class="grid-content -visible-overflow small-12 large-10">
-        <%= render(EnterpriseEdition::BannerComponent.new(:edit_attribute_groups, mb: 3)) %>
-
-        <% unless EnterpriseToken.allows_to?(:edit_attribute_groups) %>
-          <%= angular_component_tag "opce-no-results",
-                                    inputs: {
-                                      title: t("text_form_configuration") + t("text_custom_field_hint_activate_per_project")
-                                    } %>
-        <% end %>
-      </div>
-    </div>
-    <div class="grid-block -visible-overflow wrap">
-      <div class="grid-content -visible-overflow small-12 large-10">
-
-        <% no_filter_query = ::API::V3::Queries::QueryParamsRepresenter.new(Query.new_default.tap { |q| q.filters = [] }).to_json %>
-        <%= f.hidden_field :attribute_groups, value: "", class: "admin-type-form--hidden-field" %>
-        <%= content_tag(
-              "opce-admin-type-form-configuration",
-              "",
-              data: {
-                "active-groups": form_attributes[:actives],
-                "inactive-attributes": form_attributes[:inactives],
-                "no-filter-query": no_filter_query
-              }
-            ) %>
-      </div>
-    </div>
-  </div>
-</section>
-
-<div class="grid-block">
-  <div class="generic-table--action-buttons">
-    <%= styled_button_tag t(@type.new_record? ? :button_create : :button_save),
-                          data: { turbo_submits_with: t(@type.new_record? ? :button_create : :button_save) },
-                          class: "form-configuration--save -primary -with-icon icon-checkmark" %>
-  </div>
-</div>
diff --git a/app/views/work_package_types/form_configuration_tab/edit.html.erb b/app/views/work_package_types/form_configuration_tab/edit.html.erb
index d523df84aff..d477197c93e 100644
--- a/app/views/work_package_types/form_configuration_tab/edit.html.erb
+++ b/app/views/work_package_types/form_configuration_tab/edit.html.erb
@@ -31,13 +31,19 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= render ::Types::EditPageHeaderComponent.new(type: @type, tabs: types_tabs) %>
 
-<%=
-  primer_form_with(
-    model: @type,
-    url: type_form_configuration_path(@type),
-    builder: TabularFormBuilder,
-    lang: current_language
-  ) do |f|
-    render partial: "form", locals: { f: f }
-  end
-%>
+<%= render(EnterpriseEdition::BannerComponent.new(:edit_attribute_groups, mb: 3)) %>
+
+<% unless EnterpriseToken.allows_to?(:edit_attribute_groups) %>
+  <%= render(Primer::Alpha::Banner.new(scheme: :default, icon: :info, mb: 3)) do %>
+    <%= t("text_form_configuration") %> <%= t("text_custom_field_hint_activate_per_project") %>
+  <% end %>
+<% end %>
+
+<% no_filter_query = ::API::V3::Queries::QueryParamsRepresenter.new(Query.new_default.tap { |q| q.filters = [] }).to_json %>
+<%= render(
+      WorkPackageTypes::FormConfigurationComponent.new(
+        type: @type,
+        form_attributes: form_configuration_groups(@type),
+        no_filter_query:
+      )
+    ) %>
diff --git a/app/workers/project_identifiers/convert_project_to_semantic_ids_job.rb b/app/workers/project_identifiers/convert_project_to_semantic_ids_job.rb
index b44ac1c1bd6..451622e9065 100644
--- a/app/workers/project_identifiers/convert_project_to_semantic_ids_job.rb
+++ b/app/workers/project_identifiers/convert_project_to_semantic_ids_job.rb
@@ -29,9 +29,6 @@
 #++
 
 class ProjectIdentifiers::ConvertProjectToSemanticIdsJob < ApplicationJob
-  include GoodJob::ActiveJobExtensions::Concurrency
-
-  good_job_control_concurrency_with(perform_limit: 5)
   queue_with_priority :above_normal
   retry_on StandardError, wait: :polynomially_longer, attempts: 8
   discard_on ActiveRecord::RecordNotFound
diff --git a/config/initializers/02-secret_key_base_check.rb b/config/initializers/02-secret_key_base_check.rb
new file mode 100644
index 00000000000..8849ba62bc4
--- /dev/null
+++ b/config/initializers/02-secret_key_base_check.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+# Refuse to boot in production if SECRET_KEY_BASE is a known-weak default that
+# we have shipped in our Dockerfile or referenced in our documentation.
+# An attacker who knows the secret can forge signed cookies and session data
+# and decrypt anything derived from it.
+insecure_secret_key_bases = [
+  "OVERWRITE_ME", # default value in Dockerfile
+  "secret", # old sample from documentation
+  "<your-secret-key-base>" # new sample from documentation
+].freeze
+
+no_rake_task = !(Rake.respond_to?(:application) && Rake.application.top_level_tasks.present?)
+no_override = ENV["OPENPROJECT_DISABLE__SECRET_KEY_BASE__CHECK"] != "true"
+if Rails.env.production? && no_rake_task && no_override
+  secret = ENV["SECRET_KEY_BASE"].to_s
+  fatal_reason =
+    if secret.empty?
+      "SECRET_KEY_BASE is not set."
+    elsif insecure_secret_key_bases.include?(secret)
+      "SECRET_KEY_BASE is set to a well-known default value (#{secret.inspect})."
+    end
+
+  if fatal_reason
+    abort <<~ERROR # rubocop:disable Rails/Exit
+      ======= INSECURE SECRET_KEY_BASE DETECTED =======
+      #{fatal_reason}
+
+      OpenProject uses SECRET_KEY_BASE to sign cookies, sessions, and other
+      security-sensitive data. Running with a default or weak value allows
+      anyone to forge signed data and compromise the installation.
+
+      Generate a strong, random value (for example via `openssl rand -hex 64`)
+      and provide it via the SECRET_KEY_BASE environment variable. The same
+      value MUST be reused on every container/process start, otherwise
+      existing sessions and encrypted database content become unreadable.
+
+      If you know what you are doing and want to disable this check, set the environment
+      variable OPENPROJECT_DISABLE__SECRET_KEY_BASE__CHECK to "true" (not recommended).
+
+      Documentation:
+      - https://www.openproject.org/docs/installation-and-operations/installation/docker/
+
+      =================================================
+    ERROR
+  end
+end
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index b728aeaf9c2..4346142d319 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -32,4 +32,4 @@
 
 # Specify a serializer for the signed and encrypted cookie jars.
 # Valid options are :json, :marshal, and :hybrid.
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
+Rails.application.config.action_dispatch.cookies_serializer = :json
diff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rb
index dd30f593c64..785337e54b0 100644
--- a/config/initializers/permissions.rb
+++ b/config/initializers/permissions.rb
@@ -70,7 +70,7 @@ Rails.application.reloader.to_prepare do
 
       map.permission :create_user,
                      {
-                       users: %i[index show new create resend_invitation],
+                       users: %i[index show new create resend_invitation configure_view_modal],
                        "users/memberships": %i[create],
                        admin: %i[index]
                      },
@@ -85,7 +85,8 @@ Rails.application.reloader.to_prepare do
                                  update_reminders update_email_alerts update_workdays
                                  update_participating update_non_participating update_date_alerts
                                  new_project_settings create_project_settings
-                                 edit_project_settings update_project_settings destroy_project_settings],
+                                 edit_project_settings update_project_settings destroy_project_settings
+                                 configure_view_modal],
                        "users/memberships": %i[create update destroy],
                        admin: %i[index]
                      },
@@ -96,7 +97,7 @@ Rails.application.reloader.to_prepare do
 
       map.permission :view_all_principals,
                      {
-                       users: %i[index show]
+                       users: %i[index show configure_view_modal]
                      },
                      permissible_on: :global,
                      require: :loggedin,
diff --git a/config/initializers/subscribe_listeners.rb b/config/initializers/subscribe_listeners.rb
index ab907b2238b..26a34655726 100644
--- a/config/initializers/subscribe_listeners.rb
+++ b/config/initializers/subscribe_listeners.rb
@@ -41,10 +41,11 @@ Rails.application.config.after_initialize do
     # A job is scheduled immediately that creates notifications (in-app if
     # supported) right away and schedules jobs to be run for mail and digest
     # mails.
-    Notifications::WorkflowJob
-      .perform_later(:create_notifications,
-                     journal,
-                     send_notifications)
+    if send_notifications
+      Notifications::WorkflowJob.perform_later(:create_notifications,
+                                               journal,
+                                               send_notifications)
+    end
 
     # A job is scheduled for the end of the journal aggregation time. If the
     # journal still exists with a matching updated_at value (it might be updated
diff --git a/config/locales/crowdin/af.yml b/config/locales/crowdin/af.yml
index 6f00a64c2db..9bf293b9cdd 100644
--- a/config/locales/crowdin/af.yml
+++ b/config/locales/crowdin/af.yml
@@ -1339,6 +1339,37 @@ af:
     edit:
       form_configuration:
         tab: Vorm konfigurasie
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekte
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ af:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ af:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ af:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ af:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml
index f24e598680e..031149f7ab7 100644
--- a/config/locales/crowdin/ar.yml
+++ b/config/locales/crowdin/ar.yml
@@ -1411,6 +1411,37 @@ ar:
     edit:
       form_configuration:
         tab: تشكيل النموذج
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: المشاريع
         enable_all: Enable for all projects
@@ -1519,8 +1550,8 @@ ar:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2502,7 +2533,7 @@ ar:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4674,6 +4705,10 @@ ar:
     one: 1 comment
     other: "%{count} تعليقات"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} مفتوح"
@@ -5028,13 +5063,6 @@ ar:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: إضافة مجموعات عمل
   permission_add_messages: نشر الرسائل
diff --git a/config/locales/crowdin/az.yml b/config/locales/crowdin/az.yml
index b40220de0da..ad11f65b2b9 100644
--- a/config/locales/crowdin/az.yml
+++ b/config/locales/crowdin/az.yml
@@ -1339,6 +1339,37 @@ az:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ az:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ az:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ az:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ az:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/be.yml b/config/locales/crowdin/be.yml
index e40cf51ac1e..da557552d4f 100644
--- a/config/locales/crowdin/be.yml
+++ b/config/locales/crowdin/be.yml
@@ -1375,6 +1375,37 @@ be:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1479,8 +1510,8 @@ be:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2458,7 +2489,7 @@ be:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4548,6 +4579,10 @@ be:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4890,13 +4925,6 @@ be:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml
index 51ba46806ac..f490f790c1b 100644
--- a/config/locales/crowdin/bg.yml
+++ b/config/locales/crowdin/bg.yml
@@ -1339,6 +1339,37 @@ bg:
     edit:
       form_configuration:
         tab: Конфигурация на формата
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Проекти
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ bg:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ bg:
               attribute_unknown_name: 'Използван е невалиден атрибут на работния пакет: %{attribute}'
               duplicate_group: Името на групата '%{group}' се използва повече от веднъж. Имената на групите трябва да са уникални.
               query_invalid: 'Вградената заявка ''%{group}'' е невалидна: %{details}'
-              group_without_name: Не са разрешени неименовани групи.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4418,6 +4449,10 @@ bg:
     one: 1 коментар
     other: "%{count} коментара"
     zero: няма коментари
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 отворен
     other: "%{count} отворени"
@@ -4748,13 +4783,6 @@ bg:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml
index 46cbe0e83cb..4a25555bb42 100644
--- a/config/locales/crowdin/ca.yml
+++ b/config/locales/crowdin/ca.yml
@@ -1338,6 +1338,37 @@ ca:
     edit:
       form_configuration:
         tab: Configuració del formulari
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projectes
         enable_all: Enable for all projects
@@ -1438,8 +1469,8 @@ ca:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2413,7 +2444,7 @@ ca:
               attribute_unknown_name: 'L''atribut de paquet de treball utilitzat és invàlid: %{attribute}'
               duplicate_group: El nom del grup "%{group}" ja està utilitzat. El nom del grup ha de ser únic.
               query_invalid: 'La consulta incrustrada "%{group}" és invàlida: %{details}'
-              group_without_name: No estan permesos els grups sense nom.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4417,6 +4448,10 @@ ca:
     one: Un comentari
     other: "%{count} comentaris"
     zero: sense comentaris
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: Un obert
     other: "%{count} oberts"
@@ -4751,13 +4786,6 @@ ca:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Afegir paquets de treball
   permission_add_messages: Publicar missatges
diff --git a/config/locales/crowdin/ckb-IR.yml b/config/locales/crowdin/ckb-IR.yml
index cb18e72a804..27ca349cb2e 100644
--- a/config/locales/crowdin/ckb-IR.yml
+++ b/config/locales/crowdin/ckb-IR.yml
@@ -1339,6 +1339,37 @@ ckb-IR:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ ckb-IR:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ ckb-IR:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ ckb-IR:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ ckb-IR:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml
index eb12be06660..fd40ba2342b 100644
--- a/config/locales/crowdin/cs.yml
+++ b/config/locales/crowdin/cs.yml
@@ -1375,6 +1375,37 @@ cs:
     edit:
       form_configuration:
         tab: Konfigurace formuláře
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekty
         enable_all: Povolit pro všechny projekty
@@ -1479,8 +1510,8 @@ cs:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2460,7 +2491,7 @@ cs:
               attribute_unknown_name: 'Použitý neplatný atribut pracovního balíčku: %{attribute}'
               duplicate_group: Název skupiny '%{group}' je použit více než jednou. Názvy skupin musí být jedinečné.
               query_invalid: 'Vložený dotaz ''%{group}'' je neplatný: %{details}'
-              group_without_name: Nepojmenované skupiny nejsou povoleny.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4550,6 +4581,10 @@ cs:
     one: 1 komentář
     other: "%{count} komentáře"
     zero: žádné komentáře
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 otevřený
     other: "%{count} otevřených"
@@ -4892,13 +4927,6 @@ cs:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Přidat komentáře
   permission_add_work_packages: Přidat pracovní balíčky
   permission_add_messages: Odesílat zprávy
diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml
index 790a7276542..33d9dfbe088 100644
--- a/config/locales/crowdin/da.yml
+++ b/config/locales/crowdin/da.yml
@@ -1338,6 +1338,37 @@ da:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekter
         enable_all: Enable for all projects
@@ -1438,8 +1469,8 @@ da:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2413,7 +2444,7 @@ da:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4419,6 +4450,10 @@ da:
     one: 1 kommentar
     other: "%{count} kommentarer"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 åben
     other: "%{count} åbne"
@@ -4751,13 +4786,6 @@ da:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Tilføj arbejdspakker
   permission_add_messages: Send beskeder
diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml
index 6c5685616fd..12b9146f012 100644
--- a/config/locales/crowdin/de.yml
+++ b/config/locales/crowdin/de.yml
@@ -266,7 +266,7 @@ de:
                 permissions: Berechtigungen
                 projects: Projekte
                 issues: Tickets
-                issue_details: Beschreibung, Verlaud, Kommentare und Anhänge
+                issue_details: Beschreibung, Verlauf, Kommentare und Anhänge
                 custom_fields: Ein Teil der benutzerdefinierten Felder
                 users: Beteiligte Benutzer und Gruppen
             confirm_import:
@@ -465,8 +465,8 @@ de:
         label: 'Rolle: %{role}'
         no_role: Rolle auswählen
         roles:
-          one: One role selected
-          other: "%{count} roles selected"
+          one: Eine Rolle ausgewählt
+          other: "%{count} Rollen ausgewählt"
       blankslate:
         title: Keine Statusübergänge konfiguriert
         description: Status hinzufügen, um mit der Konfiguration von Arbeitsabläufen für diese Rolle zu beginnen
@@ -1127,8 +1127,8 @@ de:
       matrix_check_uncheck_all_in_row_label_html: Umschalten von <em>%{permission}</em> Berechtigung für alle Rollen
       matrix_check_uncheck_all_in_col_label_html: Umschalten aller %{module} Berechtigungen für die Rolle <em>%{role}</em>
   users:
-    force_password_change_hint: Der Benutzer muss bei seiner nächsten Anmeldung ein neues Passwort festlegen. Wird automatisch aktiviert, wenn die Anmeldedaten per E-Mail gesendet werden.
-    send_information_hint: Sendet das Passwort im Klartext per E-Mail. Wenn diese Option aktiviert ist, wird der Benutzer aufgefordert, sein Passwort bei der ersten Anmeldung zu ändern.
+    force_password_change_hint: Bei der nächsten Anmeldung muss ein neues Passwort festgelegt werden. Wird automatisch aktiviert, wenn Zugangsdaten per E-Mail versendet werden.
+    send_information_hint: Sendet das Passwort als Klartext per E-Mail. Wenn aktiviert, ist eine Passwortänderung bei der ersten Anmeldung erforderlich.
     autologins:
       prompt: "%{num_days} lang angemeldet bleiben"
     sessions:
@@ -1335,6 +1335,37 @@ de:
     edit:
       form_configuration:
         tab: Formularkonfiguration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekte
         enable_all: Für alle Projekte aktivieren
@@ -1437,8 +1468,8 @@ de:
     bulk_delete_dialog:
       title: "%{count} Arbeitspakete löschen"
       heading: Diese %{count} Arbeitspakete unwiderruflich löschen?
-      description: 'Die folgenden Arbeitspakete, einschließlich der Unteraufgaben und aller zugehörigen Daten, werden dauerhaft gelöscht:'
-      description_with_children: 'Die folgenden Arbeitspakete, einschließlich der Unteraufgaben und aller zugehörigen Daten, werden dauerhaft gelöscht:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: Ich bestätige, dass alle ausgewählten Arbeitspakete inklusive ihrer Unteraufgaben dauerhaft gelöscht werden.
       cross_project_warning: 'Diese Arbeitspakete umfassen mehrere Projekte: %{projects}'
       children_label: 'Die folgenden Unteraufgaben werden ebenfalls gelöscht:'
@@ -2410,7 +2441,7 @@ de:
               attribute_unknown_name: 'Ungültige Arbeitspaket-Attribute verwendet: %{attribute}'
               duplicate_group: Der Gruppen-Name %{group} wird mehr als einmal verwendet. Gruppen-Namen müssen eindeutig sein.
               query_invalid: 'Die eingebettete Ansicht ''%{group}'' ist ungültig: %{details}'
-              group_without_name: Unbenannte Gruppen sind nicht erlaubt.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Ein oder mehrere Attribute des Feldes sind ungültig. Bitte korrigieren Sie die Attribute vor dem Speichern.
         user:
@@ -2744,7 +2775,7 @@ de:
   button_confirm: Bestätigen
   button_configure: Konfigurieren
   button_continue: Fortfahren
-  button_complete: Fertigstellen
+  button_complete: Abschließen
   button_copy: Kopieren
   button_copy_to_clipboard: In Zwischenablage kopieren
   button_copy_link_to_clipboard: Link in Zwischenablage kopieren
@@ -3420,22 +3451,22 @@ de:
     report_component:
       checks:
         failures:
-          one: "%{count} check failed"
-          other: "%{count} checks failed"
+          one: "%{count} Überprüfung fehlgeschlagen"
+          other: "%{count} Überprüfungen fehlgeschlagen"
         success: All checks passed
         warnings:
           one: "%{count} check returned a warning"
           other: "%{count} checks returned a warning"
       summary:
         failure: Some checks failed and the system does not work as expected.
-        success: All connections and systems are working as expected.
-        warning: Some checks returned a warning. This can lead to unexpected behaviour.
+        success: Alle Verbindungen und Systeme funktionieren wie erwartet.
+        warning: Einige Überprüfungen ergaben eine Warnung. Dies kann zu unerwartetem Verhalten führen.
     result_component:
       status:
-        failed: Failed
-        passed: Passed
-        skipped: Skipped
-        warning: Warning
+        failed: Fehlgeschlagen
+        passed: Bestanden
+        skipped: Übersprungen
+        warning: Warnung
   homescreen:
     additional:
       projects: Neueste sichtbare Projekte in dieser Instanz.
@@ -3618,7 +3649,7 @@ de:
         personal_reminder: Bei persönlichen Erinnerungen benachrichtigen
       daily_reminders:
         title: Tägliche E-Mail-Erinnerungen für ungelesene Benachrichtigungen zusenden
-        description: You will receive these reminders only for unread notifications and only at hours you specify. Until you configure a time zone for your account, the times will be interpreted to be in UTC.
+        description: Sie erhalten diese Erinnerungen nur für ungelesene Benachrichtigungen und nur zu den von Ihnen angegebenen Zeiten. Solange Sie keine Zeitzone für Ihr Konto konfigurieren, werden die Zeiten in UTC interpretiert.
         enabled: Tägliche E-Mail-Erinnerungen aktivieren
         add_time: Zeit hinzufügen
         remove_time: Zeit entfernen
@@ -3632,7 +3663,7 @@ de:
         date_range: Pausenzeiten
       email_alerts:
         title: E-Mail-Benachrichtigungen für andere Objekte (die keine Arbeitspakete sind)
-        description: Notifications today are limited to work packages. You can choose to continue receiving email alerts for these events until they are included in notifications.
+        description: Die Benachrichtigungen sind aktuell auf Arbeitspakete beschränkt. Sie können die E-Mail-Benachrichtigungen für diese Ereignisse so lange erhalten, bis sie in den Benachrichtigungen enthalten sind.
         news_added: Neuigkeit hinzugefügt
         news_commented: Kommentar zu einer Neuigkeit
         document_added: Dokument hinzugefügt
@@ -3645,7 +3676,7 @@ de:
     notifications:
       participating:
         title: Beteiligt
-        description: Notifications for all activities in work packages you are involved in (assignee, accountable or watcher).
+        description: Benachrichtigungen für alle Aktivitäten in Arbeitspaketen, an denen Sie beteiligt sind (Zugewiesen an, Verantwortlich(e/r) oder Beobachter).
         submit_button: Einstellungen aktualisieren
         mentioned: Erwähnt
         watched: Beobachtet
@@ -3654,7 +3685,7 @@ de:
         shared: Mit mir geteilt
       date_alerts:
         title: Datums-Erinnerungen
-        description: Automatic notifications when important dates are approaching for open work packages you are involved in (assignee, accountable or watcher).
+        description: Automatische Benachrichtigungen, wenn wichtige Termine für offene Arbeitspakete bevorstehen, an denen Sie beteiligt (z. B. zugewiesen, verantwortlich oder Beobachter) sind.
         submit_button: Datums-Erinnerungen aktualisieren
         start_date: Anfangstermin
         due_date: Endtermin
@@ -3669,7 +3700,7 @@ de:
           seven_days_after: 7 Tage danach
       non_participating:
         title: Nicht beteiligt
-        description: Additional notifications for activities in all projects.
+        description: Zusätzliche Benachrichtigungen für Aktivitäten in allen Projekten.
         submit_button: Einstellungen aktualisieren
         work_package_created: Neue Arbeitspakete
         work_package_commented: Alle neuen Kommentare
@@ -3678,7 +3709,7 @@ de:
         work_package_scheduled: Alle Datumsänderungen
       project_specific_settings:
         title: Projektspezifische Benachrichtigungen
-        description: These project-specific settings override default settings above.
+        description: Diese projektspezifischen Einstellungen überschreiben die Standardeinstellungen oben
         add_button: Projektspezifische Benachrichtigungen hinzufügen
         dialog_title: Projektspezifische Benachrichtigungen hinzufügen
         list_header: Projekte mit spezifischen Benachrichtigungen
@@ -3737,7 +3768,7 @@ de:
   label_age: Geändert vor
   label_ago: vor (Tage)
   label_all: alle
-  label_all_uppercase: All
+  label_all_uppercase: Alle
   label_all_time: gesamter Zeitraum
   label_all_words: Alle Wörter
   label_all_open_wps: Alle offenen
@@ -3839,7 +3870,7 @@ de:
   label_commits_per_month: Übertragungen pro Monat
   label_confirmation: Bestätigung
   label_contains: enthält
-  label_starts_with: starts with
+  label_starts_with: beginnt mit
   label_content: Inhalt
   label_color_plural: Farben
   label_copied: kopiert
@@ -3847,8 +3878,8 @@ de:
   label_copy_source: Quelle
   label_copy_target: Ziel
   label_copy_workflow_from: Workflow kopieren von
-  label_copy_workflow_from_type: Copy to another type
-  label_copy_workflow_from_role: Copy to other roles
+  label_copy_workflow_from_type: In einen anderen Typ kopieren
+  label_copy_workflow_from_role: In andere Rollen kopieren
   label_copy_project: Projekt kopieren
   label_core_version: Core Version
   label_core_build: Core-Buildinformation
@@ -4047,8 +4078,8 @@ de:
   label_custom_pdf_export_settings: Benutzerdefinierte PDF-Export-Einstellungen
   label_custom_favicon: Benutzerdefiniertes Favicon
   label_custom_touch_icon: Benutzerdefiniertes Touch-Icon
-  label_departments: Organization
-  label_departments_description_html: 'Define your company’s structure by creating departments and sub-departments in a hierarchical way. This allows you to reflect reporting lines and maintain a clear, structured overview of your organization within OpenProject. You can also import an existing organization structure through [LDAP group synchronisation](ldap_docs_article).
+  label_departments: Organisation
+  label_departments_description_html: 'Definieren Sie die Struktur Ihres Unternehmens, indem Sie Abteilungen und Unterabteilungen in hierarchischer Form anlegen. So können Sie Berichtslinien abbilden und einen klaren, strukturierten Überblick über Ihre Organisation in OpenProject behalten. Sie können auch eine bestehende Organisationsstruktur über [LDAP-Gruppensynchronisation](ldap_docs_article) importieren.
 
     '
   label_logout: Abmelden
@@ -4156,7 +4187,7 @@ de:
   label_password_rule_numeric: Ziffern
   label_password_rule_special: Sonderzeichen
   label_password_rule_uppercase: Großbuchstaben
-  label_password_requirement_lowercase: Must contain at least one lowercase character.
+  label_password_requirement_lowercase: Muss mindestens einen Kleinbuchstaben enthalten.
   label_password_requirement_numeric: Muss mindestens ein numerisches Zeichen enthalten.
   label_password_requirement_special: Muss mindestens ein Sonderzeichen enthalten.
   label_password_requirement_uppercase: Muss mindestens einen Großbuchstaben enthalten.
@@ -4414,6 +4445,10 @@ de:
     one: Ein Kommentar
     other: "%{count} Kommentare"
     zero: Keine Kommentare
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 offen
     other: "%{count} offen"
@@ -4527,7 +4562,7 @@ de:
       note: 'Anmerkung: „%{note}“'
     sharing:
       work_packages:
-        allowed_actions_html: 'Sie haben auf diesem Arbeitspakte folgende Berechtigungen: %{allowed_actions}. Dies kann sich je nach Ihrer Projektrolle und Berechtigungen ändern.'
+        allowed_actions_html: 'Sie haben auf diesem Arbeitspaket folgende Berechtigungen: %{allowed_actions}. Dies kann sich je nach Ihrer Projektrolle und Berechtigungen ändern.'
         create_account: Um auf dieses Arbeitspaket zuzugreifen, müssen Sie ein Konto für %{instance} erstellen und aktivieren.
         open_work_package: Arbeitspaket öffnen
         subject: Arbeitspaket %{id} wurde mit Ihnen geteilt
@@ -4750,13 +4785,6 @@ de:
       work_package_card_component:
         menu:
           label_actions: Arbeitspaket-Aktionen
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Kommentare hinzufügen
   permission_add_work_packages: Arbeitspakete hinzufügen
   permission_add_messages: Forenbeiträge hinzufügen
@@ -5079,7 +5107,7 @@ de:
 
     '
   setting_after_login_default_redirect_url: Weiterleitung nach Anmeldung
-  setting_after_login_default_redirect_url_example_html: 'Set a default path to redirect users after login, if no back link was provided. Redirects to home page if not set. <br/> Example: %{example_code}
+  setting_after_login_default_redirect_url_example_html: 'Legen Sie einen Standardpfad fest, zu dem nach der Anmeldung weitergeleitet wird, wenn kein Back-Link vorhanden ist. Falls nicht gesetzt, wird zur Startseite weitergeleitet. <br/> Beispiel: %{example_code}
 
     '
   setting_apiv3_cors_title: Cross-Origin Resource Sharing (CORS)
diff --git a/config/locales/crowdin/el.yml b/config/locales/crowdin/el.yml
index b29a7fbe3b8..4e957791f65 100644
--- a/config/locales/crowdin/el.yml
+++ b/config/locales/crowdin/el.yml
@@ -1338,6 +1338,37 @@ el:
     edit:
       form_configuration:
         tab: Διαμόρφωση φόρμας
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Έργα
         enable_all: Enable for all projects
@@ -1438,8 +1469,8 @@ el:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2413,7 +2444,7 @@ el:
               attribute_unknown_name: 'Χρησιμοποιήθηκε μη έγκυρο χαρακτηριστικό πακέτου εργασίας: %{attribute}'
               duplicate_group: Το όνομα της ομάδας %{group} χρησιμοποιείται περισσότερες από μία φορές. Τα ονόματα ομάδων πρέπει να είναι μοναδικά.
               query_invalid: 'Η ενσωματωμένη αναζήτηση ''%{group}'' δεν είναι έγκυρη: %{details}'
-              group_without_name: Δεν επιτρέπονται ομάδες χωρίς όνομα.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4419,6 +4450,10 @@ el:
     one: 1 σχόλιο
     other: "%{count} σχόλια"
     zero: κανένα σχόλιο
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 ανοικτό
     other: "%{count} ανοικτά"
@@ -4751,13 +4786,6 @@ el:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Προσθήκη πακέτων εργασίας
   permission_add_messages: Δημοσίευση μηνυμάτων
diff --git a/config/locales/crowdin/eo.yml b/config/locales/crowdin/eo.yml
index a6ee444a3e5..80678ab9ad5 100644
--- a/config/locales/crowdin/eo.yml
+++ b/config/locales/crowdin/eo.yml
@@ -1339,6 +1339,37 @@ eo:
     edit:
       form_configuration:
         tab: Formulara agordo
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projektoj
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ eo:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ eo:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ eo:
     one: 1 komento
     other: "%{count} komentoj"
     zero: sen komentoj
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 malfermita
     other: "%{count} malfermitaj"
@@ -4752,13 +4787,6 @@ eo:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/es.yml b/config/locales/crowdin/es.yml
index d15d9773268..e67f50787eb 100644
--- a/config/locales/crowdin/es.yml
+++ b/config/locales/crowdin/es.yml
@@ -1336,6 +1336,37 @@ es:
     edit:
       form_configuration:
         tab: Configuración del formulario
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Proyectos
         enable_all: Habilitar en todos los proyectos
@@ -1436,8 +1467,8 @@ es:
     bulk_delete_dialog:
       title: Eliminar %{count} paquetes de trabajo
       heading: "¿Desea eliminar estos %{count} paquetes de trabajo de forma definitiva?"
-      description: 'Los siguientes paquetes de trabajo, incluidos los subpaquetes y todos los datos asociados, se eliminarán de forma definitiva:'
-      description_with_children: 'Se eliminarán de forma definitiva los siguientes paquetes de trabajo, incluidos los paquetes de trabajo secundarios, así como todos los datos asociados:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: Entiendo que todos los paquetes de trabajo seleccionados y sus elementos secundarios se eliminarán de forma permanente.
       cross_project_warning: 'Estos paquetes de trabajo abarcan varios proyectos: %{projects}'
       children_label: 'También se eliminarán los siguientes elementos secundarios:'
@@ -2409,7 +2440,7 @@ es:
               attribute_unknown_name: 'Se ha utilizado un atributo de paquete de trabajo no válido: %{attribute}'
               duplicate_group: El nombre de grupo “%{group}” se usó más de una vez. Los nombres de grupo tienen que ser únicos.
               query_invalid: 'La consulta insertada “%{group}” no es válida: %{details}'
-              group_without_name: No se permiten grupos sin nombre.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Uno o más atributos dentro del campo no son válidos. Corrija los atributos antes de guardar.
         user:
@@ -4411,6 +4442,10 @@ es:
     one: 1 comentario
     other: "%{count} comentarios"
     zero: sin comentarios
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 abierto
     other: "%{count} abiertos"
@@ -4743,13 +4778,6 @@ es:
       work_package_card_component:
         menu:
           label_actions: Acciones del paquete de trabajo
-      work_package_card_list_component:
-        header:
-          label_actions: Abrir menú
-          label_work_package_count:
-            zero: No hay paquetes de trabajo
-            one: "%{count} paquete de trabajo"
-            other: "%{count} paquetes de trabajo"
   permission_add_work_package_comments: Añadir comentarios
   permission_add_work_packages: Añadir paquetes de trabajo
   permission_add_messages: Publicar mensajes
diff --git a/config/locales/crowdin/et.yml b/config/locales/crowdin/et.yml
index 4875fd0bf23..9d7273c50d3 100644
--- a/config/locales/crowdin/et.yml
+++ b/config/locales/crowdin/et.yml
@@ -1339,6 +1339,37 @@ et:
     edit:
       form_configuration:
         tab: Vormi seadistamine
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projektid
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ et:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ et:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ et:
     one: 1 kommentaar
     other: "%{count} kommentaari"
     zero: kommentaare pole
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 avatud
     other: "%{count} avatud"
@@ -4750,13 +4785,6 @@ et:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Lisa kommentaare
   permission_add_work_packages: Teemasid lisada
   permission_add_messages: Postitusi lisada
diff --git a/config/locales/crowdin/eu.yml b/config/locales/crowdin/eu.yml
index c0fd17a98c8..c1ca9d12e2c 100644
--- a/config/locales/crowdin/eu.yml
+++ b/config/locales/crowdin/eu.yml
@@ -1339,6 +1339,37 @@ eu:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ eu:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ eu:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ eu:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ eu:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/fa.yml b/config/locales/crowdin/fa.yml
index 2008bc4b7a1..6f5e7fa524a 100644
--- a/config/locales/crowdin/fa.yml
+++ b/config/locales/crowdin/fa.yml
@@ -1339,6 +1339,37 @@ fa:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: پروژه‌ها
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ fa:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ fa:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ fa:
     one: 1 comment
     other: نظر %{count}
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} باز"
@@ -4752,13 +4787,6 @@ fa:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml
index 76357525c9c..2d7e2390dd1 100644
--- a/config/locales/crowdin/fi.yml
+++ b/config/locales/crowdin/fi.yml
@@ -1339,6 +1339,37 @@ fi:
     edit:
       form_configuration:
         tab: Lomakkeen muokkaus
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projektit
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ fi:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ fi:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Nimeämätön ryhmät eivät ole sallittuja.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4418,6 +4449,10 @@ fi:
     one: 1 kommentti
     other: "%{count} kommenttia"
     zero: ei kommentteja
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 avoin
     other: "%{count} avointa"
@@ -4750,13 +4785,6 @@ fi:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Lisää tehtävä
   permission_add_messages: Jätä viesti
diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml
index 13f02783881..0c69c58fd6b 100644
--- a/config/locales/crowdin/fil.yml
+++ b/config/locales/crowdin/fil.yml
@@ -1339,6 +1339,37 @@ fil:
     edit:
       form_configuration:
         tab: Form kompigurasyon
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Mga proyekto
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ fil:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ fil:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Wala pangalan ng grupo ay hindi pinapayagan.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ fil:
     one: Isang komento
     other: "%{count} mga komento"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: Isa ang bukas
     other: "%{count} ang bukas"
@@ -4754,13 +4789,6 @@ fil:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Magdagdag ng mga work package
   permission_add_messages: Mga post na mensahe
diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml
index 5130a8b690d..a9af9fd867d 100644
--- a/config/locales/crowdin/fr.yml
+++ b/config/locales/crowdin/fr.yml
@@ -247,8 +247,8 @@ fr:
               label_info: Veuillez noter que cet outil d'importation est en version bêta et qu'il ne peut pas importer tous les types de données. Voici un résumé de ce que l'instance Jira hôte offre pour l'importation et de ce que cet outil est capable d'importer pour le moment.
               description: Sélectionnez les données que vous souhaitez importer parmi les données disponibles extraites de l'instance Jira hôte.
               label_supported_data: Données prises en charge
-              label_coming_soon: Coming soon (Q2 2026)
-              label_coming_later: Coming later
+              label_coming_soon: Prochainement (T2 2026)
+              label_coming_later: À venir
               label_available_server_data: Données disponibles sur %{server_info}
               button_select_projects: Sélectionnez les projets à importer
               button_continue: Continuer
@@ -465,8 +465,8 @@ fr:
         label: 'Rôle : %{role}'
         no_role: Sélectionner un rôle
         roles:
-          one: One role selected
-          other: "%{count} roles selected"
+          one: Un rôle sélectionné
+          other: "%{count} rôles sélectionnés"
       blankslate:
         title: Aucune transition de statut configurée
         description: Ajouter des statuts pour commencer à configurer des flux de travail pour ce rôle
@@ -1332,6 +1332,37 @@ fr:
     edit:
       form_configuration:
         tab: Configuration du formulaire
+        label_group: Groupe
+        reset_to_defaults: Rétablir les valeurs par défaut
+        add_attribute_group: Ajouter un groupe d’attributs
+        add_query_group: Ajouter un tableau des lots de travaux associés
+        delete_group: Supprimer le groupe
+        remove_attribute: Retirer du groupe
+        drag_to_activate: Faites glisser les champs à partir d'ici pour les activer
+        drag_to_reorder: Glisser pour réorganiser
+        edit_query: Modifier la requête
+        custom_field: Champ personalisé
+        filter_inactive: Filtrer les attributs
+        inactive_attributes_heading: Attributs inactifs
+        no_inactive_attributes: Pas d'attributs inactifs
+        blankslate_title: Aucun groupe pour le moment
+        blankslate_description: Ajoutez des groupes à l'aide du bouton ci-dessus ou faites glisser des attributs depuis le panneau de gauche.
+        group_actions: Actions de groupe
+        rename_group: Renommer le groupe
+        confirm_delete_group: Êtes-vous sûr de vouloir supprimer ce groupe ? Cette action ne peut pas être annulée.
+        group_name_label: Nom du groupe
+        row_actions: Actions de ligne
+        query_group_label: Tableau des lots de travaux
+        empty_group_hint: Glisser les attributs ici
+        invalid_attribute_groups: La charge utile de la configuration du formulaire n'est pas valide.
+        invalid_query: La configuration de la requête intégrée n'est pas valide.
+        not_found: L'élément de configuration du formulaire demandé n'a pas été trouvé.
+        untitled_group: Groupe sans titre
+        reset_title: Réinitialiser la configuration du formulaire
+        confirm_reset: Êtes-vous sûr de vouloir réinitialiser la configuration du formulaire ?
+        reset_description: 'Cette opération rétablit les attributs dans leur groupe par défaut et désactive TOUS les champs personnalisés.
+
+          '
       projects:
         tab: Projets
         enable_all: Activer pour tous les projets
@@ -1432,8 +1463,8 @@ fr:
     bulk_delete_dialog:
       title: Supprimer %{count} lots de travaux
       heading: Supprimer définitivement ces %{count} lots de travaux ?
-      description: 'Les lots de travaux suivants, y compris les enfants et toutes les données associées, seront définitivement supprimés :'
-      description_with_children: 'Les lots de travaux suivants, y compris les lots de travaux enfants, et toutes les données associées seront définitivement supprimés :'
+      description: 'Les lots de travaux suivants et toutes les données qui y sont associées seront définitivement supprimés :'
+      description_with_children: 'Les lots de travaux suivants, y compris les enfants et toutes les données associées, seront définitivement supprimés :'
       confirm_children_deletion: Je reconnais que tous les lots de travaux sélectionnés et leurs enfants seront définitivement supprimés.
       cross_project_warning: 'Ces lots de travaux s''étendent sur plusieurs projets : %{projects}'
       children_label: 'Les enfants suivants seront également supprimés :'
@@ -2407,7 +2438,7 @@ fr:
               attribute_unknown_name: 'Attribut du lot de travaux invalide : %{attribute}'
               duplicate_group: Le nom de groupe "%{group}" est utilisé plus d'une fois. Les noms de groupe doivent être uniques.
               query_invalid: 'La requête intégrée "%{group}" est invalide : %{details}'
-              group_without_name: Les groupes sans nom ne sont pas autorisés.
+              group_without_name: Le nom du groupe ne peut pas être vide
             patterns:
               invalid_tokens: Un ou plusieurs attributs dans le champ ne sont pas valides. Veuillez corriger les attributs avant d'enregistrer.
         user:
@@ -2540,7 +2571,7 @@ fr:
       unsupported_storage_type: n'est pas un type de stockage pris en charge.
       storage_error: Une erreur s'est produite lors de la connexion à l'espace de stockage.
       invalid_input: L'entrée n'est pas valide.
-      invalid_child_for_parent: is not allowed as a parent for this view type.
+      invalid_child_for_parent: n'est pas autorisé en tant que parent pour ce type de vue.
   activity:
     item:
       created_by_on: créé par %{user} le %{datetime}
@@ -3419,22 +3450,22 @@ fr:
     report_component:
       checks:
         failures:
-          one: "%{count} check failed"
-          other: "%{count} checks failed"
-        success: All checks passed
+          one: "%{count} vérification a échoué"
+          other: "%{count} vérifications ont échoué"
+        success: Toutes les vérifications ont été validées
         warnings:
-          one: "%{count} check returned a warning"
-          other: "%{count} checks returned a warning"
+          one: "%{count} vérification a renvoyé un avertissement"
+          other: "%{count} vérifications ont renvoyé un avertissement"
       summary:
-        failure: Some checks failed and the system does not work as expected.
-        success: All connections and systems are working as expected.
-        warning: Some checks returned a warning. This can lead to unexpected behaviour.
+        failure: Certaines vérifications ont échoué et le système ne fonctionne pas comme prévu.
+        success: Toutes les connexions et les systèmes fonctionnent comme prévu.
+        warning: Certaines vérifications ont renvoyé un avertissement. Cela peut entraîner un comportement inattendu.
     result_component:
       status:
-        failed: Failed
-        passed: Passed
-        skipped: Skipped
-        warning: Warning
+        failed: Échec
+        passed: Approuvé
+        skipped: Ignoré
+        warning: Avertissement
   homescreen:
     additional:
       projects: Les projets visibles les plus récents de cette instance.
@@ -3736,7 +3767,7 @@ fr:
   label_age: Âge
   label_ago: il y a
   label_all: tous
-  label_all_uppercase: All
+  label_all_uppercase: Tout
   label_all_time: tout le temps
   label_all_words: Tous les mots
   label_all_open_wps: Tous les ouverts
@@ -4413,6 +4444,10 @@ fr:
     one: 1 commentaire
     other: "%{count} commentaires"
     zero: aucun commentaire
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 ouvert
     other: "%{count} ouverts"
@@ -4491,7 +4526,7 @@ fr:
       you_have: Vous avez
     logo_alt_text: Logo
     mention:
-      subject: "%{user_name} mentioned you in %{id} - %{subject}"
+      subject: "%{user_name} vous a mentionné(e) dans %{id} - %{subject}"
     notification:
       center: Vers le centre de notifications
       see_in_center: Voir le commentaire dans le centre de notifications
@@ -4529,7 +4564,7 @@ fr:
         allowed_actions_html: 'Vous disposez des autorisations suivantes sur ce lot de travaux : %{allowed_actions}. Cela peut changer en fonction de votre rôle dans le projet et de vos autorisations.'
         create_account: Pour accéder à ce lot de travaux, vous aurez besoin de créer et activer un compte sur %{instance}.
         open_work_package: Ouvrir ce lot de travaux
-        subject: Work package %{id} was shared with you
+        subject: Le lot de travaux %{id} a été partagé avec vous
         enterprise_text: Partagez les lots de travaux avec des utilisateurs qui ne sont pas membres du projet.
         summary:
           user: "%{user} a partagé un lot de travaux avec vous avec les droits %{role_rights}"
@@ -4745,13 +4780,6 @@ fr:
       work_package_card_component:
         menu:
           label_actions: Actions du lot de travaux
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Ajouter des commentaires
   permission_add_work_packages: Ajouter des lots de travaux
   permission_add_messages: Poster des messages
@@ -5074,7 +5102,7 @@ fr:
 
     '
   setting_after_login_default_redirect_url: Après la redirection de connexion
-  setting_after_login_default_redirect_url_example_html: 'Set a default path to redirect users after login, if no back link was provided. Redirects to home page if not set. <br/> Example: %{example_code}
+  setting_after_login_default_redirect_url_example_html: 'Définissez un chemin par défaut pour rediriger les utilisateurs après leur connexion, si aucun lien de retour n''est fourni. Les utilisateurs sont redirigés vers la page d''accueil si ce champ n''est pas défini. <br/> Exemple : %{example_code}
 
     '
   setting_apiv3_cors_title: Partage croisé des ressources (CORS)
@@ -5624,7 +5652,7 @@ fr:
   text_project_identifier_format: Doit commencer par une lettre minuscule. Seules les lettres minuscules (a-z), les chiffres, les tirets et les traits de soulignement sont autorisés.
   text_reassign: 'Réaffecter au lot de travaux :'
   text_regexp_multiline: L'expression régulière est appliquée en mode multi-ligne, e.g. ^---\\s+
-  text_rename_wiki_page: Rename wiki page
+  text_rename_wiki_page: Renommer la page wiki
   text_repository_usernames_mapping: |-
     Définir ou modifier les associations entre les utilisateurs d'OpenProject et les utilisateurs trouvés dans le dépôt.
     Les utilisateurs ayant des noms ou des adresses e-mail identiques sont automatiquement associés.
@@ -6068,8 +6096,8 @@ fr:
 
       '
     confirm_revoke_my_application:
-      one: Do you really want to remove this application? This will revoke one token active for it.
-      other: Do you really want to remove this application? This will revoke %{count} tokens active for it.
+      one: Voulez-vous vraiment supprimer cette demande ? Cela aura pour effet de révoquer un jeton actif associé.
+      other: Voulez-vous vraiment supprimer cette demande ? Cela aura pour effet de révoquer %{count} jetons actifs associés.
     authorization_error: Une erreur d'autorisation s'est produite.
     my_registered_applications: Applications OAuth enregistrées
   oauth_client:
diff --git a/config/locales/crowdin/he.yml b/config/locales/crowdin/he.yml
index e40fa418308..2de4862d427 100644
--- a/config/locales/crowdin/he.yml
+++ b/config/locales/crowdin/he.yml
@@ -1375,6 +1375,37 @@ he:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: פרויקטים
         enable_all: Enable for all projects
@@ -1479,8 +1510,8 @@ he:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2458,7 +2489,7 @@ he:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4548,6 +4579,10 @@ he:
     one: תגובה אחד
     other: "%{count} תגובות"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: אחד פתוח
     other: "%{count} פתוחים"
@@ -4890,13 +4925,6 @@ he:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/hi.yml b/config/locales/crowdin/hi.yml
index 852936c2adc..aa98a5be33f 100644
--- a/config/locales/crowdin/hi.yml
+++ b/config/locales/crowdin/hi.yml
@@ -1339,6 +1339,37 @@ hi:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ hi:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ hi:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: समूह का नाम ' %{group} ' एक से अधिक बार प्रयोग किया जाता है । समूह नाम अनंय होना आवश्यक है ।
               query_invalid: 'एंबेडेड क्वेरी ''%{group} '' अमान्य है: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ hi:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ hi:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml
index 5753f04fb6f..e9cedf38308 100644
--- a/config/locales/crowdin/hr.yml
+++ b/config/locales/crowdin/hr.yml
@@ -1357,6 +1357,37 @@ hr:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekti
         enable_all: Enable for all projects
@@ -1459,8 +1490,8 @@ hr:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2436,7 +2467,7 @@ hr:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4482,6 +4513,10 @@ hr:
     one: 1 komentar
     other: "%{count} komentara"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 započet
     other: "%{count} započeta"
@@ -4819,13 +4854,6 @@ hr:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Dodaj radne pakete
   permission_add_messages: Pošalji poruke
diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml
index cbc0dd6c430..8fbba99af00 100644
--- a/config/locales/crowdin/hu.yml
+++ b/config/locales/crowdin/hu.yml
@@ -1357,6 +1357,37 @@ hu:
     edit:
       form_configuration:
         tab: Űrlap konfiguráció
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projektek
         enable_all: Enable for all projects
@@ -1459,8 +1490,8 @@ hu:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2466,7 +2497,7 @@ hu:
               attribute_unknown_name: Érvénytelen munkacsomag értek %{attribute}
               duplicate_group: A %{group} név már használatban van. A csoport névnek egyedinek kell lennie.
               query_invalid: 'A beágyazott lekérdezés ''%{group}'' érvénytelen: %{details}'
-              group_without_name: Névtelen csoport nem engedélyezett.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4484,6 +4515,10 @@ hu:
     one: 1 komment
     other: "%{count} hozzászólás"
     zero: nincsenek hozzászólások
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 nyitott
     other: "%{count} nyitott"
@@ -4840,13 +4875,6 @@ hu:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: feladatcsoport hozzáadása
   permission_add_messages: Elküldött üzenetek
diff --git a/config/locales/crowdin/hy.seeders.yml b/config/locales/crowdin/hy.seeders.yml
new file mode 100644
index 00000000000..2c7f7ea49a7
--- /dev/null
+++ b/config/locales/crowdin/hy.seeders.yml
@@ -0,0 +1,507 @@
+#This file has been generated by script/i18n/generate_seeders_i18n_source_file.
+#Please do not edit directly.
+#This file is part of the sources sent to crowdin for translation.
+---
+hy:
+  seeds:
+    common:
+      colors:
+        item_0:
+          name: Blue (dark)
+        item_1:
+          name: Blue
+        item_2:
+          name: Blue (light)
+        item_3:
+          name: Green (light)
+        item_4:
+          name: Green (dark)
+        item_5:
+          name: Yellow
+        item_6:
+          name: Orange
+        item_7:
+          name: Red
+        item_8:
+          name: Magenta
+        item_9:
+          name: White
+        item_10:
+          name: Grey (light)
+        item_11:
+          name: Grey
+        item_12:
+          name: Grey (dark)
+        item_13:
+          name: Black
+      project_phase_colors:
+        item_0:
+          name: PM2 Orange
+        item_1:
+          name: PM2 Red
+        item_2:
+          name: PM2 Magenta
+        item_3:
+          name: PM2 Green Yellow
+      project_query_roles:
+        item_0:
+          name: Project query viewer
+        item_1:
+          name: Project query editor
+      work_package_roles:
+        item_0:
+          name: Work package editor
+        item_1:
+          name: Work package commenter
+        item_2:
+          name: Work package viewer
+      project_roles:
+        item_0:
+          name: Non member
+        item_1:
+          name: Anonymous
+        item_2:
+          name: Member
+        item_3:
+          name: Reader
+        item_4:
+          name: Project admin
+      global_roles:
+        item_0:
+          name: Staff and projects manager
+        item_1:
+          name: Standard global role
+    standard:
+      project_phases:
+        item_0:
+          name: Initiating
+        item_1:
+          name: Planning
+          start_gate: Ready for Planning
+        item_2:
+          name: Executing
+          start_gate: Ready for Executing
+        item_3:
+          name: Closing
+          start_gate: Ready for Closing
+      priorities:
+        item_0:
+          name: Low
+        item_1:
+          name: Normal
+        item_2:
+          name: High
+        item_3:
+          name: Immediate
+      projects:
+        demo-project:
+          name: Demo project
+          status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
+          description: This is a short summary of the goals of this demo project.
+          news:
+            item_0:
+              title: Welcome to your demo project
+              summary: |
+                We are glad you joined.
+                In this module you can communicate project news to your team members.
+              description: The actual news
+          categories:
+            item_0: Category 1 (to be changed in Project settings)
+          queries:
+            item_0:
+              name: Project plan
+            item_1:
+              name: Milestones
+            item_2:
+              name: Tasks
+            item_3:
+              name: Team planner
+          boards:
+            kanban:
+              name: Kanban board
+            basic:
+              name: Basic board
+              lists:
+                item_0:
+                  name: Wish list
+                item_1:
+                  name: Short list
+                item_2:
+                  name: Priority list for today
+                item_3:
+                  name: Never
+            parent_child:
+              name: Work breakdown structure
+          project-overview:
+            widgets:
+              item_0:
+                options:
+                  name: Welcome
+              item_1:
+                options:
+                  name: Getting started
+                  text: |
+                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+
+                    Discover the most important features with our [Guided Tour]({{opSetting:base_url}}/projects/demo-project/work_packages/?start_onboarding_tour=true).
+
+                    _Try the following steps:_
+
+                    1. *Invite new members to your project*: &rightarrow; Go to [Members]({{opSetting:base_url}}/projects/demo-project/members) in the project navigation.
+                    2. *View the work in your project*: &rightarrow; Go to [Work packages]({{opSetting:base_url}}/projects/demo-project/work_packages) in the project navigation.
+                    3. *Create a new work package*: &rightarrow; Go to [Work packages &rightarrow; Create]({{opSetting:base_url}}/projects/demo-project/work_packages/new).
+                    4. *Create and update a project plan*: &rightarrow; Go to [Project plan]({{opSetting:base_url}}/projects/demo-project/work_packages?query_id=##query.id:demo_project__query__project_plan) in the project navigation.
+                    5. *Activate further modules*: &rightarrow; Go to [Project settings &rightarrow; Modules]({{opSetting:base_url}}/projects/demo-project/settings/modules).
+                    6. *Complete your tasks in the project*: &rightarrow; Go to [Work packages &rightarrow; Tasks]({{opSetting:base_url}}/projects/demo-project/work_packages/details/##wp.id:set_date_and_location_of_conference/overview?query_id=##query.id:demo_project__query__tasks).
+
+                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
+                    Please let us know if you have any questions or need support. Contact us: [support[at]openproject.com](mailto:support@openproject.com).
+              item_5:
+                options:
+                  name: Work packages
+              item_6:
+                options:
+                  name: Milestones
+          work_packages:
+            item_0:
+              subject: Start of project
+            item_1:
+              subject: Organize open source conference
+              children:
+                item_0:
+                  subject: Set date and location of conference
+                  children:
+                    item_0:
+                      subject: Send invitation to speakers
+                    item_1:
+                      subject: Contact sponsoring partners
+                    item_2:
+                      subject: Create sponsorship brochure and hand-outs
+                item_1:
+                  subject: Invite attendees to conference
+                item_2:
+                  subject: Setup conference website
+            item_2:
+              subject: Conference
+            item_3:
+              subject: Follow-up tasks
+              children:
+                item_0:
+                  subject: Upload presentations to website
+                item_1:
+                  subject: Party for conference supporters :-)
+                  description: |-
+                    *   [ ] Beer
+                    *   [ ] Snacks
+                    *   [ ] Music
+                    *   [ ] Even more beer
+            item_4:
+              subject: End of project
+          wiki: |
+            _In this wiki you can collaboratively create and edit pages and sub-pages to create a project wiki._
+
+            **You can:**
+
+            * Insert text and images, also with copy and paste from other documents
+            * Create a page hierarchy with parent pages
+            * Include wiki pages to the project menu
+            * Use macros to include, e.g. table of contents, work package lists, or Gantt charts
+            * Include wiki pages in other text fields, e.g. project overview page
+            * Include links to other documents
+            * View the change history
+            * View as Markdown
+
+            More information: [https://www.openproject.org/docs/user-guide/wiki/](https://www.openproject.org/docs/user-guide/wiki/)
+        scrum-project:
+          name: Scrum project
+          status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
+          description: This is a short summary of the goals of this demo Scrum project.
+          news:
+            item_0:
+              title: Welcome to your Scrum demo project
+              summary: |
+                We are glad you joined.
+                In this module you can communicate project news to your team members.
+          versions:
+            item_0:
+              name: Bug Backlog
+            item_1:
+              name: Product Backlog
+            item_2:
+              name: Sprint 1
+              wiki:
+                title: Sprint 1
+                content: |
+                  ### Sprint planning meeting
+
+                  _Please document here topics to the Sprint planning meeting_
+
+                  * Time boxed (8 h)
+                  * Input: Product Backlog
+                  * Output: Sprint Backlog
+
+                  * Divided into two additional time boxes of 4 h:
+
+                      * The Product Owner presents the [Product Backlog]({{opSetting:base_url}}/projects/your-scrum-project/backlogs) and the priorities to the team and explains the Sprint Goal, to which the team must agree. Together, they prioritize the topics from the Product Backlog which the team will take care of in the next sprint. The team commits to the discussed delivery.
+                      * The team plans autonomously (without the Product Owner) in detail and breaks down the tasks from the discussed requirements to consolidate a [Sprint Backlog]({{opSetting:base_url}}/projects/your-scrum-project/backlogs).
+
+
+                  ### Daily Scrum meeting
+
+                  _Please document here topics to the Daily Scrum meeting_
+
+                  * Short, daily status meeting of the team.
+                  * Time boxed (max. 15 min).
+                  * Stand-up meeting to discuss the following topics from the [Task board](##sprint:scrum_project__version__sprint_1).
+                      * What do I plan to do until the next Daily Scrum?
+                      * What has blocked my work (Impediments)?
+                  * Scrum Master moderates and notes down [Sprint Impediments](##sprint:scrum_project__version__sprint_1).
+                  * Product Owner may participate may participate in order to stay informed.
+
+                  ### Sprint Review meeting
+
+                  _Please document here topics to the Sprint Review meeting_
+
+                  * Time boxed (4 h).
+                  * A maximum of one hour of preparation time per person.
+                  * The team shows the product owner and other interested persons what has been achieved in this sprint.
+                  * Important: no dummies and no PowerPoint! Just finished product functionality (Increments) should be demonstrated.
+                  * Feedback from Product Owner, stakeholders and others is desired and will be included in further work.
+                  * Based on the demonstrated functionalities, the Product Owner decides to go live with this increment or to develop it further. This possibility allows an early ROI.
+
+
+                  ### Sprint Retrospective
+
+                  _Please document here topics to the Sprint Retrospective meeting_
+
+                  * Time boxed (3 h).
+                  * After Sprint Review, will be moderated by Scrum Master.
+                  * The team discusses the sprint: what went well, what needs to be improved to be more productive for the next sprint or even have more fun.
+            item_3:
+              name: Sprint 2
+          categories:
+            item_0: Category 1 (to be changed in Project settings)
+          queries:
+            item_0:
+              name: Project plan
+            item_1:
+              name: Product backlog
+            item_2:
+              name: Sprint 1
+            item_3:
+              name: Tasks
+          boards:
+            kanban:
+              name: Kanban board
+            basic:
+              name: Task board
+              lists:
+                item_0:
+                  name: Wish list
+                item_1:
+                  name: Short list
+                item_2:
+                  name: Priority list for today
+                item_3:
+                  name: Never
+          project-overview:
+            widgets:
+              item_0:
+                options:
+                  name: Welcome
+              item_1:
+                options:
+                  name: Getting started
+                  text: |
+                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+
+                    _Try the following steps:_
+
+                    1. *Invite new members to your project*: &rightarrow; Go to [Members]({{opSetting:base_url}}/projects/your-scrum-project/members) in the project navigation.
+                    2. *View your Product backlog and Sprint backlogs*: &rightarrow; Go to [Backlogs]({{opSetting:base_url}}/projects/your-scrum-project/backlogs) in the project navigation.
+                    3. *View your Task board*: &rightarrow; Go to [Backlogs]({{opSetting:base_url}}/projects/your-scrum-project/backlogs) &rightarrow; Click on right arrow on Sprint &rightarrow; Select [Task Board](##sprint:scrum_project__version__sprint_1).
+                    4. *Create a new work package*: &rightarrow; Go to [Work packages &rightarrow; Create]({{opSetting:base_url}}/projects/your-scrum-project/work_packages/new).
+                    5. *Create and update a project plan*: &rightarrow; Go to [Project plan](##query:scrum_project__query__project_plan) in the project navigation.
+                    6. *Create a Sprint wiki*: &rightarrow; Go to [Backlogs]({{opSetting:base_url}}/projects/your-scrum-project/backlogs) and open the sprint wiki from the right drop down menu in a sprint. You can edit the [wiki template]({{opSetting:base_url}}/projects/your-scrum-project/wiki/) based on your needs.
+                    7. *Activate further modules*: &rightarrow; Go to [Project settings &rightarrow; Modules]({{opSetting:base_url}}/projects/your-scrum-project/settings/modules).
+
+                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
+                    Please let us know if you have any questions or need support. Contact us: [support[at]openproject.com](mailto:support@openproject.com).
+              item_5:
+                options:
+                  name: Work packages
+              item_6:
+                options:
+                  name: Project plan
+          work_packages:
+            item_0:
+              subject: New login screen
+            item_1:
+              subject: Password reset does not send email
+            item_2:
+              subject: New website
+              children:
+                item_0:
+                  subject: Newsletter registration form
+                item_1:
+                  subject: Implement product tour
+                item_2:
+                  subject: New landing page
+                  children:
+                    item_0:
+                      subject: Create wireframes for new landing page
+            item_3:
+              subject: Contact form
+            item_4:
+              subject: Feature carousel
+              children:
+                item_0:
+                  subject: Make screenshots for feature tour
+            item_5:
+              subject: Wrong hover color
+            item_6:
+              subject: SSL certificate
+            item_7:
+              subject: Set-up Staging environment
+            item_8:
+              subject: Choose a content management system
+            item_9:
+              subject: Website navigation structure
+              children:
+                item_0:
+                  subject: Set up navigation concept for website.
+            item_10:
+              subject: Internal link structure
+            item_11:
+              subject: Develop v1.0
+            item_12:
+              subject: Release v1.0
+            item_13:
+              subject: Develop v1.1
+            item_14:
+              subject: Release v1.1
+            item_15:
+              subject: Develop v2.0
+            item_16:
+              subject: Release v2.0
+          wiki: |
+            ### Sprint planning meeting
+
+            _Please document here topics to the Sprint planning meeting_
+
+            * Time boxed (8 h)
+            * Input: Product Backlog
+            * Output: Sprint Backlog
+
+            * Divided into two additional time boxes of 4 h:
+
+                * The Product Owner presents the [Product Backlog]({{opSetting:base_url}}/projects/your-scrum-project/backlogs) and the priorities to the team and explains the Sprint Goal, to which the team must agree. Together, they prioritize the topics from the Product Backlog which the team will take care of in the next sprint. The team commits to the discussed delivery.
+                * The team plans autonomously (without the Product Owner) in detail and breaks down the tasks from the discussed requirements to consolidate a [Sprint Backlog]({{opSetting:base_url}}/projects/your-scrum-project/backlogs).
+
+
+            ### Daily Scrum meeting
+
+            _Please document here topics to the Daily Scrum meeting_
+
+            * Short, daily status meeting of the team.
+            * Time boxed (max. 15 min).
+            * Stand-up meeting to discuss the following topics from the Task board.
+                * What do I plan to do until the next Daily Scrum?
+                * What has blocked my work (Impediments)?
+            * Scrum Master moderates and notes down Sprint Impediments.
+            * Product Owner may participate may participate in order to stay informed.
+
+            ### Sprint Review meeting
+
+            _Please document here topics to the Sprint Review meeting_
+
+            * Time boxed (4 h).
+            * A maximum of one hour of preparation time per person.
+            * The team shows the product owner and other interested persons what has been achieved in this sprint.
+            * Important: no dummies and no PowerPoint! Just finished product functionality (Increments) should be demonstrated.
+            * Feedback from Product Owner, stakeholders and others is desired and will be included in further work.
+            * Based on the demonstrated functionalities, the Product Owner decides to go live with this increment or to develop it further. This possibility allows an early ROI.
+
+
+            ### Sprint Retrospective
+
+            _Please document here topics to the Sprint Retrospective meeting_
+
+            * Time boxed (3 h).
+            * After Sprint Review, will be moderated by Scrum Master.
+            * The team discusses the sprint: what went well, what needs to be improved to be more productive for the next sprint or even have more fun.
+      statuses:
+        item_0:
+          name: New
+        item_1:
+          name: In specification
+        item_2:
+          name: Specified
+        item_3:
+          name: Confirmed
+        item_4:
+          name: To be scheduled
+        item_5:
+          name: Scheduled
+        item_6:
+          name: In progress
+        item_7:
+          name: Developed
+        item_8:
+          name: In testing
+        item_9:
+          name: Tested
+        item_10:
+          name: Test failed
+        item_11:
+          name: Closed
+        item_12:
+          name: On hold
+        item_13:
+          name: Rejected
+      time_entry_activities:
+        item_0:
+          name: Management
+        item_1:
+          name: Specification
+        item_2:
+          name: Development
+        item_3:
+          name: Testing
+        item_4:
+          name: Support
+        item_5:
+          name: Other
+      types:
+        item_0:
+          name: Task
+        item_1:
+          name: Milestone
+        item_2:
+          name: Summary task
+        item_3:
+          name: Feature
+        item_4:
+          name: Epic
+        item_5:
+          name: User story
+        item_6:
+          name: Bug
+      welcome:
+        title: Welcome to OpenProject!
+        text: |
+          OpenProject is the leading open source project management software. It supports classic, agile as well as hybrid project management and gives you full control over your data.
+
+          Core features and use cases:
+
+          * [Project Portfolio Management](https://www.openproject.org/collaboration-software-features/project-portfolio-management/)
+          * [Project Planning and Scheduling](https://www.openproject.org/collaboration-software-features/project-planning-scheduling/)
+          * [Task Management and Issue Tracking](https://www.openproject.org/collaboration-software-features/task-management/)
+          * [Agile Boards (Scrum and Kanban)](https://www.openproject.org/collaboration-software-features/agile-project-management/)
+          * [Requirements Management and Release Planning](https://www.openproject.org/collaboration-software-features/product-development/)
+          * [Time and Cost Tracking, Budgets](https://www.openproject.org/collaboration-software-features/time-tracking/)
+          * [Team Collaboration and Documentation](https://www.openproject.org/collaboration-software-features/team-collaboration/)
+
+          Welcome to the future of project management.
+
+          For Admins: You can change this welcome text [here]({{opSetting:base_url}}/admin/settings/general).
diff --git a/config/locales/crowdin/hy.yml b/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..63a227e69ec
--- /dev/null
+++ b/config/locales/crowdin/hy.yml
@@ -0,0 +1,6182 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  no_results_title_text: There is currently nothing to display.
+  activities:
+    index:
+      no_results_title_text: There has not been any activity for the project within this time frame.
+    work_packages:
+      activity_tab:
+        no_results_title_text: No activity to display
+        no_results_description_text: Choose "Show everything" to show all activity and comments
+        label_activity_show_all: Show everything
+        label_activity_show_only_comments: Show comments only
+        label_activity_show_only_changes: Show changes only
+        label_sort_asc: Newest at the bottom
+        label_sort_desc: Newest on top
+        label_type_to_comment: Add a comment. Type @ to notify people.
+        label_submit_comment: Submit comment
+        label_who: Who?
+        changed_on: changed on
+        created_on: created this on
+        changed: changed
+        created: created
+        commented: commented
+        internal_comment: Internal comment
+        internal_journal: Internal comments are visible to a limited group of members.
+        unsaved_changes_confirmation_message: You have unsaved changes. Are you sure you want to close the editor?
+        internal_comment_confirmation:
+          title: Make this comment public?
+          heading: Make this comment public?
+          description: Your comment will be visible to anyone who can access this work package. Are you sure you want to do this?
+          confirm_button_text: Make public
+  admin:
+    plugins:
+      no_results_title_text: There are currently no plugins installed.
+      no_results_content_text: See our integrations and plugins page for more information.
+    custom_styles:
+      color_theme: Color theme
+      color_theme_custom: "(Custom)"
+      tab_interface: Interface
+      tab_branding: Branding
+      tab_pdf_export_styles: PDF export styles
+      tab_pdf_export_font: PDF export font
+      fonts:
+        file_too_large: is too large (maximum size is %{count} MB).
+        file_is_invalid: is not a valid TTF font file.
+      colors:
+        primary-button-color: Primary button
+        accent-color: Accent
+        header-bg-color: Header background
+        main-menu-bg-color: Main menu background
+        main-menu-bg-selected-background: Main menu when selected
+      custom_colors: Custom colors
+      manage_colors: Edit color select options
+      instructions:
+        primary-button-color: Strong accent color, used for the most important button on a screen.
+        accent-color: Color for links and other decently highlighted elements.
+        main-menu-bg-color: Left side menu's background color.
+      theme_warning: Changing the theme will overwrite you custom style. The design will then be lost. Are you sure you want to continue?
+    enterprise:
+      delete_dialog:
+        title: Delete enterprise token
+        heading: Delete this enterprise token?
+        confirmation: Are you sure you want to delete this Enterprise edition support token?
+      create_dialog:
+        title: Add Enterprise token
+        type_token_text: Your Enterprise token text
+        token_placeholder: Paste your Enterprise edition support token here
+        token_caption: To learn more about how to activate Enterprise edition check our [documentation](docs_url).
+      add_token: Upload an Enterprise edition support token
+      replace_token: Replace your current support token
+      order: Order Enterprise on-premises edition
+      paste: Paste your Enterprise edition support token
+      required_for_feature: This add-on is only available with an active Enterprise edition support token.
+      enterprise_link: For more information, click here.
+      start_trial: Start free trial
+      book_now: Book now
+      get_quote: Get a quote
+      buttons:
+        upgrade: Upgrade now
+        contact: Contact us for a demo
+      status:
+        expired: Expired
+        expiring_soon: Expiring soon
+        in_grace_period: In grace period
+        invalid_domain: Invalid domain
+        not_active: Not active
+        trial: Trial
+    jemalloc_allocator: Jemalloc memory allocator
+    journal_aggregation:
+      caption: 'User actions on a work package (changing description, status, values, or writing comments) are grouped if performed within this period. It also controls notification and [webhook](webhook_link) delays.
+
+        '
+    import:
+      title: Import
+    jira:
+      title: Jira Migrator
+      description: Use this tool to import data from your Jira instance. You can configure multiple Jira hosts and choose what to import in each import run.
+      errors:
+        cannot_delete_with_imports: Cannot delete Jira host with existing imports
+        custom_field_creation_failed: 'Failed to create custom field ''%{name}'': %{message}'
+      blank:
+        title: No Jira hosts configured yet
+        description: Configure a Jira host to start importing items from Jira to this OpenProject instance.
+      configuration:
+        title: Jira configuration
+        new: New configuration
+      banner:
+        title: Beta - Try it out!
+        description: This Jira Migrator is currently in beta. We currently only support Jira Server/Data Center versions 10.x and 11.x. Cloud instances are not supported at this time.
+        contribution_callout: 'Please, help us improve the Jira Migrator with your feedback and private data donations. You can [join the development community](link) of the Jira Migrator.
+
+          '
+        supported_versions: ''
+      form:
+        fields:
+          name: Name
+          url: Jira Server/Data Center URL
+          personal_access_token: Personal Access Token
+        button_add: Add configuration
+        button_save: Save configuration
+        button_test: Test configuration
+        button_delete_token: Delete token
+        delete_token_confirm: Are you sure you want to delete the token? This will disable the Jira connection.
+        label_testing: Testing configuration...
+      token_deleted: Token was successfully deleted.
+      test:
+        success: Successfully connected to %{server} (version %{version})
+        failed: 'Connection failed: Unable to retrieve server information'
+        error: An unexpected error occurred while testing the connection
+        connection_error: 'Connection error: %{message}'
+        parse_error: Failed to parse the response from the server. The server may not be a valid Jira instance.
+        api_error: Jira API returned error status %{status}. Please check your Jira instance URL and API token.
+        token_error: Invalid API token. Please check your credentials in the configuration.
+        missing_credentials: Please provide both URL and Personal Access Token to test the connection
+        invalid_url: Please provide a valid URL
+      client:
+        connection_error: 'Failed to connect to Jira server: %{message}'
+        connection_timeout: 'Connection to Jira server timed out: %{message}'
+        parse_error: 'Failed to parse Jira API response: %{message}'
+        api_error: Jira API returned error status %{status}
+        401_error: Jira API returned a 401 error. Your authentication token may have expired or lack the required permissions. Please ensure the token belongs to a Jira administrator.
+      columns:
+        projects: Projects
+        last_change: Last change
+        added: Added
+        label_ago: "%{amount} ago"
+      run:
+        title: Import run
+        history: History
+        remove_error: A Jira import run cannot be removed while it is running
+        import_blocked_error: Another Jira import run is currently in progress or awaiting review. Please complete or revert it before starting a new import.
+        project_identifier_taken: 'You are trying to import a project with an already used identifier: %{taken_identifier}. Please update the project identifier in Jira then click on Retry.'
+        blank:
+          title: No import runs set up yet
+          description: Create an import run to start importing information from this Jira instance
+        index:
+          description: You can import different sets of data with each import run. It is possible to undo an import run immediately after in review mode but not after finalizing.
+          button_import_run: Import run
+          button_edit_configuration: Edit configuration
+        status:
+          initial: Start
+          instance_meta_fetching: Fetching meta data
+          instance_meta_error: Error fetching meta data
+          instance_meta_done: Meta data fetched
+          import_scope: Select scope
+          configuring: Select scope
+          projects_meta_fetching: Fetching project data
+          projects_meta_error: Error fetching project data
+          projects_meta_done: Data gathered
+          importing: In progress
+          import_error: Error during import
+          imported: Review mode
+          reverting: Reverting
+          revert_error: Error during revert
+          revert_cancelling: Cancelling revert
+          revert_cancelled: Revert cancelled
+          reverted: Reverted
+          finalizing: Finalizing
+          finalizing_error: Error during finalizing
+          finalizing_done: Completed
+        wizard:
+          button_retry: Retry
+          parts:
+            projects:
+              one: 1 project
+              other: "%{count} projects"
+            issues:
+              one: 1 issue
+              other: "%{count} issues"
+            work_packages:
+              one: 1 work package
+              other: "%{count} work packages"
+            types:
+              one: 1 type
+              other: "%{count} types"
+            statuses:
+              one: 1 status
+              other: "%{count} statuses"
+            users:
+              one: 1 user
+              other: "%{count} users"
+          groups:
+            fetch:
+              title: Get base data
+            groups_and_users:
+              title: Groups and Users
+            configuration:
+              title: Configure import
+            confirming:
+              title: Confirm and import
+            review:
+              title: Review import
+          sections:
+            fetch_data:
+              title: Fetch instance meta data
+              caption_done: Completed
+              description: Check what data is available for import in the host Jira instance.
+              button_fetch: Check available data
+              label_progress: Fetching data from Jira...
+            groups_and_users:
+              title: Groups and Users
+            import_scope:
+              title: Import scope
+              caption: Choose what you want to import into OpenProject
+              caption_done: Completed
+              label_info: Please note that this import tool is in beta and cannot import all types of data. Here is a summary of what the host Jira instance offers for import and what this tool is able to import right now.
+              description: Select what data you want to import from the available data fetched from the host Jira instance.
+              label_supported_data: Supported data
+              label_coming_soon: Coming soon (Q2 2026)
+              label_coming_later: Coming later
+              label_available_server_data: Available data on %{server_info}
+              button_select_projects: Select projects to import
+              button_continue: Continue
+              label_import: Select which projects you would like to import.
+              button_select: Select projects
+              label_selected_data: Selected data for import
+              label_progress: Fetching data from Jira...
+              elements:
+                relations: Relations between issues
+                project_ids: Project identifiers
+                issue_ids: Issues identifiers
+                sprints: Sprint assignments
+                workflows: Project-level workflows
+                schemes: Schemas
+                permissions: Permissions
+                projects: Projects
+                issues: Issues
+                issue_details: Issue description, history, comments and attachments
+                custom_fields: A subset of custom fields
+                users: Involved users and groups
+            confirm_import:
+              title: Import data
+              caption: Review your import settings and start the import
+              caption_done: Completed
+              label_available_data: Data to be imported
+              label_users_import_explanation: Users that are involved in selected projects (group memberships included)
+              button_start: Start import
+              description: You are about to start an import run with the following settings.
+              label_progress: Import in progress...
+              label_import_data: Currently importing
+            import_result:
+              title: Import run results
+              caption: Review import run or revert import
+              info: Import run was successful.
+              label_results: Imported
+              label_revert: Revert import
+              button_revert: Revert import
+              button_done: Approve import
+              preview_description: The imported data is currently in review mode. Click "Approve import" to make the import permanent or "Revert import" to undo all changes made in this import run.
+              label_finalize_import: Approve import
+              label_finalizing: Approving import...
+              label_finalizing_done: Import approved.
+              label_revert_progress: Reverting import...
+              label_reverted: Import reverted.
+          select_dialog:
+            filter_projects: Filter by text
+          import_dialog:
+            title: Please make sure you have a backup!
+            confirm_button: Start import
+            description: 'Imports change your OpenProject configuration. After the import you will have the opportunity to review the changes. While in review, you have an option to revert or approve the import. After approving the import reverting will no longer be possible. Therefore, please, make sure that you have [a backup of your OpenProject instance](link) before proceeding.
+
+              '
+            confirm: I understand and have a backup
+          revert_dialog:
+            title: Permanently revert this import?
+            description: This will delete all imported objects (including whole projects).
+            confirm: I understand that this reversion will delete data permanently
+          finalize_dialog:
+            title: Approve this import?
+            description: Once approved, this import can no longer be reverted. All imported data will become permanent.
+            confirm: I understand that this action cannot be undone
+            confirm_button: Understood
+          select_projects:
+            title: Select projects
+    mcp_configurations:
+      index:
+        description: The model context protocol allows AI agents to provide its users with tools and resources exposed by this OpenProject instance. This feature is still in beta.
+        resources_heading: Resources
+        resources_description: OpenProject implements the following resources. Each can be enabled, renamed and described as you want. For more information, please refer to the [documentation on MCP resources](docs_url).
+        resources_submit: Update resources
+        tools_heading: Tools
+        tools_description: OpenProject implements the following tools. Each can be enabled, renamed and described as you want. For more information, please refer to the [documentation on MCP tools](docs_url).
+        tools_submit: Update tools
+      multi_update:
+        success: MCP configurations were updated successfully.
+      server_form:
+        description_caption: How the MCP server will be described to other applications who connect to it.
+        title_caption: A short title shown to applications that connect to the MCP server.
+        tool_response_format: Tool response format
+        tool_response_format_content_only_label: Content only
+        tool_response_format_content_only_caption: 'Choose this if MCP clients connecting to this instance do not support structured content. Tool responses will only contain plain text content and leave out the structured version.
+
+          '
+        tool_response_format_full_label: Full
+        tool_response_format_full_caption: 'The most compatible option. Tool responses will include both regular and structured content, allowing MCP clients to choose which format they want to read. This may increase the number of tokens that the language model has to process, potentially increasing cost and decreasing performance.
+
+          '
+        tool_response_format_structured_only_label: Structured content only
+        tool_response_format_structured_only_caption: 'Choose this if you are certain that MCP clients connecting to this instance support structured content. Tool responses will only include structured content and leave out its text representation.
+
+          '
+      update:
+        failure: MCP configuration could not be updated.
+        success: MCP configuration was updated successfully.
+    scim_clients:
+      authentication_methods:
+        sso: JWT from identity provider
+        oauth2_client: OAuth 2.0 client credentials
+        oauth2_token: Static access token
+      created_client_credentials_dialog_component:
+        title: Client credentials created
+        heading: Client credentials have been generated
+        one_time_hint: This is the only time you will see the client secret. Make sure to copy it now.
+      created_token_dialog_component:
+        title: Token created
+        heading: A token has been generated
+        label_token: Token
+        one_time_hint: This is the only time you will see this token. Make sure to copy it now.
+      delete_scim_client_dialog_component:
+        title: Delete SCIM client
+        heading: Are you sure you want to delete this SCIM client?
+        description: Users managed by this SCIM client can no longer be updated by it.
+      edit:
+        label_delete_scim_client: Delete SCIM client
+      form:
+        auth_provider_description: This is the service that users added by the SCIM provider will use to authenticate in OpenProject.
+        authentication_method_description_html: This is how the SCIM client authenticates at OpenProject. Please ensure that OAuth tokens include the <code>scim_v2</code> scope.
+        description: Please refer to our [documentation on configuring SCIM clients](docs_url) for more information on these configuration options.
+        jwt_sub_description: For example, for Keycloak, this is the UUID of the service account  associated with the SCIM client. Consult [our documentation](docs_url) to learn how to find  the subject claim for your use case.
+        name_description: Choose a name that will help other admins better understand why this client was configured.
+      index:
+        description: SCIM clients configured here are able to interact with OpenProject SCIM server API to provision, update, and deprovision user accounts and groups.
+        label_create_button: Add SCIM client
+      new:
+        title: New SCIM client
+      revoke_static_token_dialog_component:
+        confirm_button: Revoke
+        title: Revoke static token
+        heading: Are you sure you want to revoke this token?
+        description: The SCIM client that uses this token will no longer be able to access OpenProject's SCIM server API.
+      table_component:
+        blank_slate:
+          title: No SCIM clients configured yet
+          description: Add clients to see them here
+        user_count: Users
+      token_list_component:
+        description: The tokens you generate here can be passed by a SCIM client to access the OpenProject SCIM API.
+        heading: Tokens
+        label_add_token: Token
+        label_aria_add_token: Add token
+      token_table_component:
+        blank_slate:
+          title: No tokens have been created yet
+          description: You can create one now
+        expired: Expired on %{date}
+        revoked: Revoked on %{date}
+        title: Access token table
+    settings:
+      new_project:
+        project_creation: Project creation
+        notification_text_default: "<p>Hello,</p> <p>A new project has been created: projectValue:name</p> <p>Thank you</p>\n"
+      work_packages_identifier:
+        page_header:
+          description: Choose between classic numerical work package IDs or semantic project-specific ones that prepend the project identifier to the work package ID.
+        banner:
+          existing_identifiers_notice: 'Existing identifiers for %{project_count} projects don''t meet requirements for project-based semantic identifiers. OpenProject can automatically update these so that they are valid as in the examples below. Click on ''Autofix and save'' to update identifiers for all projects in this manner and enable project-based semantic identifiers.
+
+            '
+        box_header:
+          label_project: Project
+          label_previous_identifier: Previous identifier
+          label_autofixed_suggestion: Future identifier
+          label_example_work_package_id: Example work package ID
+        autofix_preview:
+          error_too_long: Has to be 10 characters or fewer
+          error_numerical: Cannot be purely numerical
+          error_does_not_start_with_letter: Must start with an uppercase letter
+          error_special_characters: Special characters not allowed
+          error_not_fully_uppercased: Must be uppercase
+          error_in_use: Already in use as another project's active handle
+          error_used_in_past: Reserved by another project's handle history
+          error_reserved_by_system: Reserved as a system keyword
+          error_unknown: Needs manual review
+          remaining_projects:
+            one: "... 1 more project"
+            other: "... %{count} more projects"
+        button_autofix: Autofix and save
+        dialog:
+          title: Change work package identifiers
+          heading: Enable project-based work package IDs?
+          description: 'This will change IDs for all work packages in all projects in this instance. Previous identifiers and URLs will continue to redirect properly. This change will take some time to complete.
+
+            '
+          confirm_button: Change identifiers
+          checkbox_label: I understand that this will permanently change all work package IDs
+        success_banner: Successfully updated work package identifier format.
+        in_progress:
+          converting_banner_message: Project identifiers are currently being converted to semantic format. This may take some time.
+          reverting_banner_message: Project identifiers are currently being reverted to classic format. This may take some time.
+    workflows:
+      tabs:
+        default_transitions: Default transitions
+        user_author: User is author
+        user_assignee: User is assignee
+      status_button: Status
+      statuses_dialog:
+        title: Statuses
+        label: Statuses enabled for this type
+        caption: Add or remove statuses you would like to associate with this type. Removing a status will also delete the workflow associated with it.
+      statuses_removal_dialog:
+        title: Remove statuses
+        heading:
+          one: Remove 1 status?
+          other: Remove %{count} statuses?
+        description: Removing these statuses will make them unavailable to this type and delete existing workflows. Are you sure you want to proceed?
+        confirm: Remove
+      leave_confirmation:
+        title: Save changes before continuing?
+        description: You are about to leave this page but you have unsaved changes. Would you like to save them before continuing?
+        ignore: Ignore changes
+        save: Save changes and continue
+      role_selector:
+        title: Select roles
+        label: 'Role: %{role}'
+        no_role: Select role
+        roles:
+          one: One role selected
+          other: "%{count} roles selected"
+      blankslate:
+        title: No status transitions configured
+        description: Add statuses to start configuring workflows for this role
+    info:
+      database_deprecation_html: 'Starting with OpenProject 16.0, PostgreSQL 16 is required to use OpenProject. Your installation will remain functional with your current database, but anticipate incompatability in future releases. <br/> We have prepared [upgrade guides for all installation methods](upgrade_guide). You can perform the upgrade ahead of the next release at any time by following the guides.
+
+        '
+  authentication:
+    login_and_registration: Login and registration
+  announcements:
+    show_until: Show until
+    is_active: currently displayed
+    is_inactive: currently not displayed
+  antivirus_scan:
+    not_processed_yet_message: Downloading is blocked, as file was not scanned for viruses yet. Please try again later.
+    quarantined_message: A virus was detected in file '%{filename}'. It has been quarantined and is not available for download.
+    deleted_message: A virus was detected in file '%{filename}'. The file has been deleted.
+    deleted_by_admin: The quarantined file '%{filename}' has been deleted by an administrator.
+    overridden_by_admin: The quarantine for file '%{filename}' has been removed by %{user}. The file can now be acccessed.
+    quarantined_attachments:
+      container: Container
+      delete: Delete the quarantined file
+      title: Quarantined attachments
+      error_cannot_act_self: Cannot perform actions on your own uploaded files.
+  attribute_help_texts:
+    caption: This short version will be displayed as caption of the attribute.
+    note_public: Any text and images you add to this field are publicly visible to all logged in users.
+    text_overview: In this view, you can create custom help texts for attributes view. When defined, these texts can be shown by clicking the help icon next to its belonging attribute.
+    show_preview: Preview text
+    add_new: Add help text
+    edit_field_name: Edit help text for %{attribute_field_name}
+  background_jobs:
+    status:
+      error_requeue: 'Job experienced an error but is retrying. The error was: %{message}'
+      cancelled_due_to: 'Job was cancelled due to error: %{message}'
+  ldap_auth_sources:
+    ldap_error: 'LDAP-Error: %{error_message}'
+    ldap_auth_failed: Could not authenticate at the LDAP-Server.
+    sync_failed: 'Failed to synchronize from LDAP: %{message}.'
+    back_to_index: Click here to go back to the list of connection.
+    technical_warning: |
+      This LDAP form requires technical knowledge of your LDAP / Active Directory setup.
+      [Please visit our documentation for detailed instructions](docs_url).
+    attribute_texts:
+      name: Arbitrary name of the LDAP connection
+      host: LDAP host name or IP address
+      login_map: The attribute key in LDAP that is used to identify the unique user login. Usually, this will be `uid` or `samAccountName`.
+      generic_map: The attribute key in LDAP that is mapped to the OpenProject `%{attribute}` attribute
+      admin_map_html: 'Optional: The attribute key in LDAP that <strong>if present</strong> marks the OpenProject user an admin. Leave empty when in doubt.'
+      system_user_dn_html: |
+        Enter the DN of the system user used for read-only access.
+        <br>
+        Example: uid=openproject,ou=system,dc=example,dc=com
+      system_user_password: Enter the bind password of the system user
+      base_dn: |
+        Enter the Base DN of the subtree in LDAP you want OpenProject to look for users and groups.
+        OpenProject will filter for provided usernames in this subtree only.
+        Example: ou=users,dc=example,dc=com
+      filter_string: |
+        Add an optional RFC4515 filter to apply to the results returned for users filtered in the LDAP.
+        This can be used to restrict the set of users that are found by OpenProject for authentication and group synchronization.
+      filter_string_concat: |
+        OpenProject will always filter for the login attribute provided by the user to identify the record. If you provide a filter here,
+        it will be concatenated with an AND. By default, a catch-all (objectClass=*) will be used as a filter.
+      onthefly_register: |
+        If you check this box, OpenProject will automatically create new users from their LDAP entries
+        when they first authenticate with OpenProject.
+        Leave this unchecked to only allow existing accounts in OpenProject to authenticate through LDAP!
+    connection_encryption: Connection encryption
+    encryption_details: LDAPS / STARTTLS options
+    system_account: System account
+    system_account_legend: |
+      OpenProject requires read-only access through a system account to lookup users and groups in your LDAP tree.
+      Please specify the bind credentials for that system user in the following section.
+    ldap_details: LDAP details
+    user_settings: Attribute mapping
+    user_settings_legend: |
+      The following fields are related to how users are created in OpenProject from LDAP entries and
+      what LDAP attributes are used to define the attributes of an OpenProject user (attribute mapping).
+    tls_mode:
+      plain: none
+      simple_tls: LDAPS
+      start_tls: STARTTLS
+      plain_description: Opens an unencrypted connection to the LDAP server. Not recommended for production.
+      simple_tls_description: Use LDAPS. Requires a separate port on the LDAP server. This mode is often deprecated, we recommend using STARTTLS whenever possible.
+      start_tls_description: Sends a STARTTLS command after connecting to the standard LDAP port. Recommended for encrypted connections.
+      section_more_info_link_html: 'This section concerns the connection security of this LDAP authentication source. For more information, visit <a href="%{link}">the Net::LDAP documentation</a>.
+
+        '
+    tls_options:
+      verify_peer: Verify SSL certificate
+      verify_peer_description_html: 'Enables strict SSL verification of the certificate trusted chain. <br> <strong>Warning:</strong> Unchecking this option disables SSL verification of the LDAP server certificate. This exposes your connection to Man in the Middle attacks.
+
+        '
+      tls_certificate_description: If the LDAP server certificate is not in the trust sources of this system, you can add it manually here. Enter a PEM X509 certifiate string.
+  forums:
+    show:
+      no_results_title_text: There are currently no posts for the forum.
+  colors:
+    index:
+      no_results_title_text: There are currently no colors.
+      no_results_content_text: Create a new color
+      label_new_color: New color
+    new:
+      label_new_color: New Color
+    edit:
+      label_edit_color: Edit Color
+    form:
+      label_new_color: New color
+      label_edit_color: Edit color
+    label_no_color: No color
+    label_properties: Properties
+    label_really_delete_color: 'Are you sure, you want to delete the following color? Types using this color will not be deleted.
+
+      '
+  custom_actions:
+    actions:
+      name: Actions
+      add: Add action
+      assigned_to:
+        executing_user_value: "(Assign to executing user)"
+    conditions: Conditions
+    plural: Custom actions
+    new: New custom action
+    edit: Edit custom action %{name}
+    execute: Execute %{name}
+  custom_fields:
+    admin:
+      custom_field_projects:
+        is_for_all_blank_slate:
+          heading: For all projects
+          description: This custom field is enabled in all projects since the "For all projects" option is checked. It cannot be deactivated for individual projects.
+      items:
+        actions: Item actions
+        blankslate:
+          root:
+            title: Your list of items is empty
+            description: Start by adding items to the custom field of type hierarchy. Each item can be used to create a hierarchy bellow it. To navigate and create sub-items inside a hierarchy click on the created item.
+          item:
+            title: This item doesn't have any hierarchy level below
+            description: Add items to this list to create sub-items inside another one
+        delete_dialog:
+          title: Delete custom field item
+          heading: Delete custom field item?
+          description: This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid.
+        placeholder:
+          label: Item label
+          short: Short name
+          weight: Weight
+      notice:
+        remember_items_and_projects: Remember to set items and projects in the respective tabs for this custom field.
+      hierarchy:
+        subitems:
+          zero: no sub-items
+          one: 1 sub-item
+          other: "%{count} sub-items"
+      role_assignment:
+        title: Role Assignment
+        description: You can automatically grant a certain project role to any user assigned to this project attribute, regardless of that user’s original role in that project.
+        warning: Depending on the role selected below, the user assigned to this project attribute might gain significantly more permissions than they previously had, including the ability to add new members and elevate their role.
+        role_field_label: Project Role
+        role_field_caption: This project role will automatically be granted to any user assigned to this project attribute
+        review_hint: 'There are %{user_count} who are already assigned to this project attribute in various projects. They might get additional permissions and be added to projects they did not previously have access to.
+
+          '
+        review_button: Review users and permissions
+        dialog:
+          title: Overview of users and permissions
+          change: Change
+          changes:
+            new_member: Will be added as a member
+            remove_member: Will be removed as a member
+            gain_and_lose_role: Will lose role ‘%{old_role}’ and gain role ‘%{new_role}’
+            gain_role: Will gain role ‘%{new_role}’
+            lose_role: Will lose role ‘%{old_role}’
+            no_change: No changes
+    text_add_new_custom_field: 'To add new custom fields to a project you first need to create them before you can add them to this project.
+
+      '
+    is_enabled_globally: Is enabled globally
+    enabled_in_project: Enabled in project
+    contained_in_type: Contained in type
+    confirm_destroy_option: Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?
+    reorder_alphabetical: Reorder values alphabetically
+    reorder_confirmation: 'Warning: The current order of available values as well as all unsaved values will be lost. Are you sure you want to continue?'
+    placeholder_version_select: Work package or project selection is required first
+    calculated_field_not_editable: Non-editable attribute. This value is calculated automatically.
+    no_role_assigment: No role assignment
+    instructions:
+      is_required:
+        all: Mark the custom field as required. This will make it mandatory to fill in the field when creating new resources. Existing resources will not require a value when being updated.
+        project: Required attributes need to be filled out by the user on project creation if the field is active ('For all projects' set or copying from a project/template in which the field is active). Existing projects will not require a value when being updated.
+      is_for_all:
+        all: Mark the custom field as available in all existing and new projects.
+        project: Mark the attribute as available in all existing and new projects.
+      multi_select:
+        all: Allows the user to assign multiple values to this custom field.
+        project: Allows the user to assign multiple values to this attribute.
+      searchable:
+        all: Include the field values when using the global search functionality.
+        project: Check to make this attribute available as a filter in project lists.
+      editable:
+        all: Allow the field to be editable by users themselves.
+      admin_only:
+        all: Check to make this custom field only visible to administrators. Users without admin rights will not be able to view or edit it.
+        project: Check to make this attribute only visible to administrators. Users without admin rights will not be able to view or edit it.
+      is_filter:
+        all: 'Allow the custom field to be used in a filter in work package views. Note that only with ''For all projects'' selected, the custom field will show up in global views.
+
+          '
+      formula:
+        project: Add numeric values or type / to search for an attribute or a mathematical operator.
+      regexp:
+        all: eg. ^[A-Z0-9]+$
+        project: eg. ^[A-Z0-9]+$
+      min_max:
+        all: 0 means no restriction
+        project: 0 means no restriction
+      has_comment:
+        project: Allows the user to add a comment related to the project attribute when selecting the value in the project overview.
+    tab:
+      no_results_title_text: There are currently no custom fields.
+      no_results_content_text: Create a new custom field
+  calculated_values:
+    error_dialog:
+      title: Error with Calculated value
+    errors:
+      unknown: An unknown error occurred. Please review the formula for this Calculated value.
+      mathematical: The mathematical formula leads to an error. Please review the project calculation attribute and try again.
+      missing_value: The attribute "%{custom_field_name}" is required by this Calculated value, but is empty.
+      disabled_value: The attribute "%{custom_field_name}" is required by this Calculated value, but is disabled for the project.
+  concatenation:
+    single: or
+  danger_dialog:
+    confirmation_live_message_checked: The button to proceed is now active.
+    confirmation_live_message_unchecked: The button to proceed is now inactive. You need to tick the checkbox to continue.
+  departments:
+    edit: Edit department
+    add_user: Add user
+    add_department: Add department
+    blankslate:
+      heading: Your organization has no departments
+      description: 'Start by adding departments or users to the organization. Each department can be used to create a hierarchy below it, to navigate and create sub-department inside a hierarchy click on the created item.
+
+        '
+      add_button: Add
+    detail_blankslate:
+      heading: This department doesn’t have any hierarchy level below
+      description: Add departments or users to create sub-items inside another one.
+      add_button: Add
+    add_department_form:
+      name_label: Department name
+      name_placeholder: Enter department name
+    move_user_dialog:
+      title: User already in a department
+      heading: Move user to this department?
+      description: "%{user} is currently a member of %{from_department}. Moving them will remove them from that department."
+      confirm: Move user
+    context_menu:
+      add_sub_department: Add sub-department
+      add_user: Add user
+    flash:
+      user_added: User was successfully added to the department.
+      user_removed: User was successfully removed from the department.
+      department_created: Department was successfully created.
+    errors:
+      move_user_failed: Failed to move user between departments.
+  pagination:
+    label: Pagination
+    prev: Previous
+    prev_page: Previous Page
+    next: Next
+    next_page: Next Page
+    page: Page %{number}
+    page_with_more: Page %{number}...
+  mcp_configurations:
+    server_url_component:
+      caption: The URL at which the OpenProject MCP server will be reachable. Required for setting up MCP clients.
+      label: Server URL
+  op_dry_validation:
+    or: or
+    errors:
+      unexpected_key: is not allowed.
+      array?: must be an array.
+      decimal?: must be a decimal.
+      defined: must not be defined.
+      eql?: must be equal to %{left}.
+      filled?: must be filled.
+      format?: is in invalid format.
+      greater_or_equal_zero: must be greater or equal to 0.
+      gteq?: must be greater than or equal to %{num}.
+      hash?: must be a hash.
+      included_in?:
+        arg:
+          default: 'must be one of: %{list}.'
+          range: 'must be one of: %{list_left} - %{list_right}.'
+      int?: must be an integer.
+      key?: is missing.
+      not_found: not found.
+      respond_to?: does not implement required method.
+      rules:
+        copy_workflow_from:
+          workflow_missing: has no own workflow.
+        custom_field:
+          format_not_supported: format '%{field_format}' is unsupported.
+        item:
+          root_item: cannot be a root item.
+          not_persisted: must be an already existing item.
+        label:
+          not_unique: must be unique within the same hierarchy level.
+        short:
+          not_unique: must be unique within the same hierarchy level.
+        parent:
+          not_descendant: must be a descendant of the hierarchy root.
+      str?: must be a string.
+      time?: must be a time.
+      type?: must be %{type}.
+      uri?: is not a valid URI.
+    rules:
+      copy_workflow_from: Type for workflow copy
+      enabled: Enabled
+      depth: Depth
+      item: Item
+      label: Label
+      weight: Weight
+      short: Short name
+      parent: Parent
+      blueprint: Pattern blueprint
+  global_search:
+    title:
+      all_projects: Search for "%{search_term}" in all projects
+      current_project: Search for "%{search_term}" in %{project_name}
+      project_and_subprojects: Search for "%{search_term}" in %{project_name} and all subprojects
+    placeholder: Search in %{app_title}
+    overwritten_tabs:
+      all: All
+      messages: Forum
+      wiki_pages: Wiki
+  groups:
+    edit:
+      synchronized_groups: Synchronized groups
+    index:
+      description: By grouping users together, you can add them as members to the same projects or assign the same global roles to them.
+    table_component:
+      blank_slate:
+        description: You can define named groups of users with specific permissions.
+        title: No groups set up yet
+      user_count: User count
+    users:
+      no_results_title_text: There are currently no users part of this group.
+    memberships:
+      no_results_title_text: There are currently no projects part of this group.
+    synchronized_groups:
+      blankslate:
+        action: Authentication settings
+        description: When this group is automatically synced with groups in external identity providers like OpenID, they will appear here. You can set this up in your Authentication settings.
+        title: No synchronized groups yet
+  incoming_mails:
+    ignore_filenames: 'Specify a list of names to ignore when processing attachments for incoming mails (e.g., signatures or icons). Enter one filename per line.
+
+      '
+  portfolios:
+    index:
+      search:
+        label: Portfolio name filter
+        placeholder: Search portfolios
+      sub_items_html:
+        one: "<strong>1</strong> sub-item"
+        other: "<strong>%{count}</strong> sub-items"
+    lists:
+      active: Active portfolios
+      my: My portfolios
+      favorited: Favorite portfolios
+      archived: Archived portfolios
+  projects:
+    copy:
+      members: Project members
+      overviews: Project overview
+      queries: 'Work packages: saved views'
+      wiki_page_attachments: 'Wiki pages: attachments'
+      work_package_attachments: 'Work packages: attachments'
+      work_package_categories: 'Work packages: categories'
+      work_package_file_links: 'Work packages: file links'
+      work_package_shares: 'Work packages: shares'
+    create:
+      notification_email_subject: Your project '%{project_name}' has been created
+      complete_wizard_link: Complete the %{artefact_name}
+    delete:
+      scheduled: Deletion has been scheduled and is performed in the background. You will be notified of the result.
+      schedule_failed: 'Project cannot be deleted: %{errors}'
+      failed: Deletion of project '%{name}' has failed
+      failed_text: The request to delete project '%{name}' has failed. The project was left archived.
+      completed: Deletion of project '%{name}' completed
+      completed_text: The request to delete project '%{name}' has been completed.
+      completed_text_children: 'Additionally, the following subprojects have been deleted:'
+    index:
+      open_as_gantt: Open as Gantt view
+      no_results_title_text: There are currently no projects
+      no_results_content_text: Create a new project
+      search:
+        label: Project name filter
+        placeholder: Search by project name
+    lists:
+      active: Active projects
+      my: My projects
+      favorited: Favorite projects
+      archived: Archived projects
+      shared: Shared project lists
+      my_lists: My project lists
+      new:
+        placeholder: New project list
+      delete_modal:
+        title: Delete project list
+        heading: Delete this project list?
+        text: This action will not delete any project the list contains. Are you sure you want to delete this project list?
+    settings:
+      header_details: Basic details
+      header_status: Status
+      header_relations: Project relations
+      button_update_details: Update details
+      button_update_status_description: Update status description
+      button_update_parent_project: Update parent project
+      public_warning: 'This project is public. Anyone who has access to this instance will be able to view and interact with this project depending on their role and associated permissions. Sub-projects are not affected and have their own settings.
+
+        '
+      public_confirmation:
+        checkbox: I understand that this will make the previously private content public
+        title: Make this project public?
+        description: 'Anyone who has access to this instance will be able to view and interact with this project depending on their role and authentication settings. Sub-projects are not affected and have their own settings.
+
+          '
+      private_confirmation:
+        checkbox: I understand that this will make the previously public content private.
+        title: Make this project private?
+        description: 'The project will only be visible to project members depending on their role and associated permissions. Sub-projects are not affected and have their own settings.
+
+          '
+      change_identifier: Change identifier
+      change_identifier_dialog_title: Change project identifier
+      change_identifier_format_hint_semantic: Only uppercase letters (A–Z), numbers or underscores. Max 10 characters. Must start with a letter.
+      change_identifier_format_hint_legacy: Only lowercase letters (a–z), numbers, dashes or underscores.
+      change_identifier_warning: 'This will permanently change identifiers and URLs of all work packages in this project. The previous identifier and URLs will nevertheless continue to redirect properly.
+
+        '
+      subitems:
+        template_section: 'Select templates to be used when creating new subitems.
+
+          '
+        project_template_label: Template for projects
+        project_template_caption: Select a template project to be used as the default for new subitems of this type.
+        program_template_label: Template for programs
+        program_template_caption: Select a template program to be used as the default for new subitems of this type.
+        no_template: No predefined template
+      template:
+        menu_title: Template
+        title: Template settings
+        enable_failed: Failed to enable template mode.
+        members:
+          excluded_roles_label: Roles to exclude when template is applied
+          excluded_roles_caption: 'When creating a new project from this template, the roles selected above will be omitted. This allows you to select which members will be excluded based on their project roles. Users can then access the template for viewing purposes without being granted access to new projects created from it.
+
+            '
+      actions:
+        label_enable_all: Enable all
+        label_disable_all: Disable all
+      activities:
+        no_results_title_text: There are currently no activities available.
+      forums:
+        no_results_title_text: There are currently no forums for the project.
+        no_results_content_text: Create a new forum
+      categories:
+        no_results_title_text: There are currently no work package categories.
+        no_results_content_text: Create a new work package category
+      custom_fields:
+        no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: Project life cycle
+          description_html: The active project phases define this project's life cycle and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a>. Enabled phases will be displayed in your <a href=%{overview_url} target="_blank">project overview</a>.
+        non_defined: No phases are currently defined.
+        section_header: Phases
+        step:
+          use_in_project: Use %{step} in this project
+        filter:
+          label: Search project phase
+      project_custom_fields:
+        header:
+          title: Project attributes
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+        filter:
+          label: Search project attribute
+        actions:
+          label_enable_single: Active in this project, click to disable
+          label_disable_single: Inactive in this project, click to enable
+          remove_from_project: Remove from project
+        is_for_all_blank_slate:
+          heading: For all projects
+          description: This project attribute is enabled in all projects since the "For all projects" option is checked. It cannot be deactivated for individual projects.
+        enabled_via_assignee_when_submitted_html: This project attribute cannot be disabled since it is set as <a href=%{pir_submission_url} target="_blank">assignee when submitted</a> for project initiation requests.
+      types:
+        no_results_title_text: There are currently no types available.
+        form:
+          enable_type_in_project: Enable type "%{type}"
+      versions:
+        no_results_title_text: There are currently no versions for the project.
+        no_results_content_text: Create a new version
+        work_packages_graph: Work packages graph
+        show_work_packages: Show work packages
+      storage:
+        no_results_title_text: There is no additional recorded disk space consumed by this project.
+      work_package_priorities:
+        new_label: New priority
+      creation_wizard:
+        errors:
+          no_work_package_type: Failed to enable project initiation request because it requires at least one active work package type and this project has none. Please add at least one work package type to this project.
+          no_status_when_submitted: Failed to enable project initiation request because work package type %{type} requires at least one status associated with it. Please enable at least one status workflow for this work package type.
+        export:
+          description_attachment_export: The generated artifact will be saved as a PDF attachment to the artifact work package.
+          description_file_link_export: The artifact work package will have a file link to a PDF stored in an external file storage. Requires a working file storage with automatically-managed project folders for this project. At the moment only Nextcloud file storages are supported.
+          description_file_storage_selection: Select which of the configured external file storages should be used.
+          external_file_storage: External file storage
+          label_artifact_export: Artifact export
+          label_attachment_export: Save as work package file attachment
+          label_file_link_export: Upload file to external file storage and add file link to work package
+          pdf_file_storage: PDF file storage
+          unavailable: unavailable
+        label_request_submission: Request submission
+        project_attributes_description: 'Select which project attributes should be included in the project initiation request. This list only includes [project attributes](project_attributes_url) enabled for for this project.
+
+          '
+        enabled_because_required_html: This project attribute cannot be disabled for this project initiation request since it is defined as required. This can be changed in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance.
+    status:
+      button_edit: Edit status
+    wizard:
+      sidebar_content_title: Content
+      sections: Sections
+      title: Project initiation request
+      no_help_text: This attribute has no help text defined.
+      success: Project attributes saved and artifact work package created successfully.
+      progress_label: "%{current} of %{total}"
+      create_artifact_work_package_error: Failed to create artifact work package
+      create_artifact_storage_error: Failed to store artifact in file storage
+  lists:
+    create:
+      success: The modified list has been saved as a new list
+      failure: 'The modified list cannot be saved: %{errors}'
+    update:
+      success: The modified list has been saved
+      failure: 'The modified list cannot be saved: %{errors}'
+    publish:
+      success: The list has been made public
+      failure: 'The list cannot be made public: %{errors}'
+    unpublish:
+      success: The list has been made private
+      failure: 'The list cannot be made private: %{errors}'
+    can_be_saved: 'List modified:'
+    can_be_saved_as: 'The modifications can only be saved in a new list:'
+  members:
+    index:
+      no_results_title_text: There are currently no members part of this project.
+      no_results_content_text: Add a member to the project
+    invite_by_mail: Send invite to %{mail}
+    send_invite_to: Send invite to
+    columns:
+      shared: Shared
+    filters:
+      all_shares: All shares
+    menu:
+      all: All
+      invited: Invited
+      locked: Locked
+      project_roles: Project roles
+      wp_shares: Work package shares
+      groups: Groups
+    delete_member_dialog:
+      title: Remove member
+      will_remove_the_users_role: This will remove the user’s role from this project.
+      will_remove_the_groups_role: This will remove the group role from this project.
+      however_work_packages_shared_with_user_html:
+        one: However, %{shared_work_packages_link} has also been shared with this user.
+        other: However, %{shared_work_packages_link} have also been shared with this user.
+      however_work_packages_shared_with_group_html:
+        one: However, %{shared_work_packages_link} has also been shared with this group.
+        other: However, %{shared_work_packages_link} have also been shared with this group.
+      remove_work_packages_shared_with_user_too: A user that has been removed as member can still access shared work packages. Would you like to remove the shares too?
+      remove_work_packages_shared_with_group_too: A group that has been removed as member can still access shared work packages. Would you like to remove the shares too?
+      will_not_affect_inherited_shares: "(This will not affect work packages shared with their group)."
+      can_remove_direct_but_not_shared_roles: You can remove this user as a direct project member but a group they are in is also a member of this project, so they will continue being a member via the group.
+      also_work_packages_shared_with_user_html:
+        one: Also, %{shared_work_packages_link} has been shared with this user.
+        other: Also, %{shared_work_packages_link} have been shared with this user.
+      remove_project_membership_or_work_package_shares_too: Do you want to remove just the user as a direct member (and keep the shares) or remove the work package shares too?
+      will_remove_all_user_access_priveleges: Deleting this member will remove all access privileges of the user to the project. The user will still exist as part of the instance.
+      will_remove_all_group_access_priveleges: Deleting this member will remove all access privileges of the group to the project. The group will still exist as part of the instance.
+      cannot_delete_inherited_membership: You cannot delete this member because they belong to a group that is itself a member of this project.
+      cannot_delete_inherited_membership_note_admin_html: You can either remove the group as a member of the project or this specific member from the group in the %{administration_settings_link}.
+      cannot_delete_inherited_membership_note_non_admin: You can either remove the group as a member of the project or contact your administrator to remove this specific member from the group.
+    delete_work_package_shares_dialog:
+      title: Revoke work package shares
+      shared_with_this_user_html:
+        one: "%{all_shared_work_packages_link} has been shared with this user."
+        other: "%{all_shared_work_packages_link} have been shared with this user."
+      shared_with_this_group_html:
+        one: "%{all_shared_work_packages_link} has been shared with this group."
+        other: "%{all_shared_work_packages_link} have been shared with this group."
+      shared_with_permission_html:
+        one: Only %{shared_work_packages_link} has been shared with %{shared_role_name} permissions.
+        other: Only %{shared_work_packages_link} have been shared with %{shared_role_name} permissions.
+      revoke_all_or_with_role: Would you like to revoke access to all shared work packages, or only those with %{shared_role_name} permissions?
+      will_not_affect_inherited_shares: "(This will not affect work packages shared with their group)."
+      cannot_remove_inherited: The work packages shares shared via groups cannot be removed.
+      cannot_remove_inherited_with_role: The work packages shares with role %{shared_role_name} are shared via groups and cannot be removed.
+      cannot_remove_inherited_note_admin_html: You can either revoke the share to the group or remove this specific member from the group in the %{administration_settings_link}.
+      cannot_remove_inherited_note_non_admin: You can either revoke the share to the group or contact your administrator to remove this specific member from the group.
+      will_revoke_directly_granted_access: This action will revoke their access to all of them, but the work packages shared with a group.
+      will_revoke_access_to_all: This action will revoke their access to all of them.
+  my:
+    access_token:
+      dialog:
+        token/api:
+          dialog_title: Create new API token
+          attention_text: Treat API tokens like passwords. Anyone with this token will have access to information from this instance, share it only with trusted users.
+          dialog_body: This token will allow third-party applications to communicate with your instance. To differentiate the new API token, please give it a name.
+          create_button: Create
+          name_label: Token name
+      created_dialog:
+        one_time_warning: This is the only time you will see this token. Make sure to copy it now.
+        token/api:
+          title: The API token has been generated
+        token/rss:
+          title: The RSS token has been generated
+      failed_to_reset_token: 'Failed to reset access token: %{error}'
+      failed_to_create_token: 'Failed to create access token: %{error}'
+      failed_to_revoke_token: 'Failed to revoke access token: %{error}'
+      notice_reset_token: 'A new %{type} token has been generated. Your access token is:'
+      token_value_warning: 'Note: This is the only time you will see this token, make sure to copy it now.'
+      no_results_title_text: There are currently no access tokens available.
+      notice_api_token_revoked: The API token has been deleted. To create a new token please use the button in the API section.
+      notice_rss_token_revoked: The RSS token has been deleted. To create a new token please use the link in the RSS section.
+      notice_ical_token_revoked: iCalendar token "%{token_name}" for calendar "%{calendar_name}" of project "%{project_name}" has been revoked. The iCalendar URL with this token is now invalid.
+    password_confirmation_dialog:
+      confirmation_required: You need to enter your account password to confirm this change.
+      title: Confirm your password to continue
+  news:
+    index:
+      no_results_title_text: There is currently no news to report.
+      no_results_content_text: Add a news item
+  roles:
+    edit:
+      default_for_new_projects_warning: 'This role is configured as the default role given to non-admin users who create a project. Do not remove the following permissions, otherwise project creators will be unable to complete the setup of their newly created projects:'
+    permissions:
+      section_check_all_label: Assign all %{module} permissions
+      section_uncheck_all_label: Unassign all %{module} permissions
+    report:
+      matrix_caption: Permissions matrix for %{module} module
+      matrix_checkbox_label: Assign %{permission} permission to %{role} role
+      matrix_check_all_label: Assign all %{module} permissions to all roles
+      matrix_uncheck_all_label: Unassign all %{module} permissions from all roles
+      matrix_check_uncheck_all_in_row_label_html: Toggle <em>%{permission}</em> permission for all roles
+      matrix_check_uncheck_all_in_col_label_html: Toggle all %{module} permissions for <em>%{role}</em> role
+  users:
+    force_password_change_hint: The user must set a new password on their next login. Automatically enabled when sending credentials via email.
+    send_information_hint: Emails the password in plain text. When checked, the user will be required to change their password on first login.
+    autologins:
+      prompt: Stay logged in for %{num_days}
+    sessions:
+      session_name: "%{browser_name} %{browser_version} on %{os_name}"
+      browser: Browser
+      expires: Expires
+      last_connection: Last connection
+      device: Device / OS
+      unknown_browser: unknown browser
+      unknown_os: unknown operating system
+      unknown: "(unknown)"
+      browser_session: "(Browser session)"
+      current: Current (this device)
+      title: Session management
+      instructions: You are logged in to your account through the following devices. Revoke sessions that you do not recognise or from devices you do not control.
+      may_not_delete_current: You cannot delete your current session.
+      deletion_warning: Are you sure you want to revoke this session? You will be logged out on this device.
+    groups:
+      member_in_these_groups: 'This user is currently a member of the following groups:'
+      no_results_title_text: This user is currently not a member in any group.
+      summary_with_more_html: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary_html: Member of %{names}.
+    memberships:
+      no_results_title_text: This user is currently not a member of a project.
+    open_profile: Open profile
+    invite_user_modal:
+      invite: Invite
+      title:
+        invite: Invite user
+        invite_to_project: Invite %{type} to %{project}
+        invite_principal_to_project: Invite %{principal} to %{project}
+      project:
+        label: Project
+        required: Please select a project
+        next_button: Next
+        no_results: No projects were found
+        no_invite_rights: You are not allowed to invite members to this project
+      type:
+        required: Please select the type to be invited
+        user:
+          title: Invite user to %{project_name}
+          description: Permissions based on the assigned role in the selected project
+        group:
+          title: Invite group to %{project_name}
+          description: Permissions based on the assigned role in the selected project
+        placeholder_user:
+          title: Add placeholder user to %{project_name}
+          title_no_ee: Placeholder user (Enterprise edition only add-on)
+          description: Has no access to the project and no emails are sent out.
+        already_member_message: Already a member of %{project}
+      principal:
+        no_results_user: No users were found
+        invite_user: 'Invite:'
+        no_results_placeholder: No placeholders were found
+        create_new_placeholder: 'Create new placeholder:'
+        no_results_group: No groups were found
+        invite_to_project: Invite to %{project_name}
+        required:
+          user: Please select a user
+          placeholder: Please select a placeholder
+          group: Please select a group
+      role:
+        label: Role in %{project}
+        no_roles_found: No roles were found
+        description: 'This is the role that the user will receive when they join your project. The role defines which actions they are allowed to take and which information they are allowed to see. [Learn more about roles and permissions.](docs_url)
+
+          '
+        required: Please select a role
+      message:
+        label: Invitation message
+        description: We will send an email to the user, to which you can add a personal message here. An explanation for the invitation could be useful, or perhaps a bit of information regarding the project to help them get started.
+      summary:
+        next_button: Send invitation
+      success_message:
+        user: The user can now log in to access %{project}. Meanwhile you can already plan with that user and assign work packages for instance.
+        placeholder_user: The placeholder can now be used in %{project}. Meanwhile you can already plan with that user and assign work packages for instance.
+        group: The group is now a part of %{project}. Meanwhile you can already plan with that group and assign work packages for instance.
+    working_hours:
+      current_schedule:
+        title: Current schedule
+        work_days: Work days
+        work_hours: Work hours
+        availability_factor: Availability factor
+        availability_subtitle: Dedicated to project work
+        effective_hours: Effective work hours
+        effective_subtitle: Per week
+        not_set: Not set
+      future:
+        title: Future schedules
+        description: Plan working schedule changes ahead of time. Once the date arrives your working schedules will be updated automatically.
+        add_button: Add future schedule
+        blank_title: No future schedules planned
+        blank_description: Create a future schedule to plan changes ahead of time
+      history:
+        title: Schedule history
+        description: View your past work schedules.
+        blank_title: No schedule history yet
+        blank_description: Past schedule changes will appear here
+      destroy:
+        confirm: Are you sure you want to delete this working schedule?
+      form:
+        title: Plan a future work schedule
+        title_current: Edit current work schedule
+        start_date: Start date
+        start_date_caption: Select the date from when the new work schedule will be effective.
+        work_days: Work days
+        working_hours_label: Working hours
+        hours_mode_label: Hours mode
+        same_hours_mode: Same hours per day
+        individual_hours_mode: Individual hours per day
+        work_hours: Work hours
+        hours_per_day: Hours per day
+        per_day: per day
+        per_week: per week
+        total_work_hours: Total work hours
+        availability_description: The availability factor represents the actual percentage of your working time dedicated to project tasks. This accounts for meetings, emails, administrative work, and other non-project activities.
+        availability_factor: Availability factor
+        availability_factor_caption: Define the percentage of your working time dedicated to project work.
+        total_available_hours: Total available work hours
+        title_availability_factor: Availability factor
+        title_days_and_hours: Days and hours
+        title_future_dates: Future dates
+      table:
+        mobile_title: Working schedules
+        start_date: Start date
+        work_days: Work days
+        work_hours: Work hours
+        availability_factor: Availability factor
+        effective_work_hours: Effective work hours
+        work_days_count:
+          one: 1 working day
+          other: "%{count} working days"
+  user_preferences:
+    disable_keyboard_shortcuts_caption: 'You can choose to disable default [keyboard shortcuts](docs_url) if you use a screen  reader or want to avoid accidentally triggering an action with a shortcut.
+
+      '
+  page:
+    text: Text
+  placeholder_users:
+    right_to_manage_members_missing: 'You are not allowed to delete the placeholder user. You do not have the right to manage members for all projects that the placeholder user is a member of.
+
+      '
+    delete_tooltip: Delete placeholder user
+    deletion_info:
+      heading_html: Delete placeholder user %{name}
+      data_consequences: 'All occurrences of the placeholder user (e.g., as assignee, responsible or other user values) will be reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account.
+
+        '
+      irreversible: This action is irreversible
+      confirmation_html: Enter the placeholder user name %{name} to confirm the deletion.
+  priorities:
+    edit:
+      priority_color_text: |
+        Click to assign or change the color of this priority.
+        It can be used for highlighting work packages in the table.
+    admin:
+      default:
+        caption: Making this priority default will override the previous default priority.
+  reactions:
+    action_title: React
+    add_reaction: Add reaction
+    react_with: React with %{reaction}
+    and_user: and %{user}
+    and_others:
+      one: and 1 other
+      other: and %{count} others
+    reaction_by: "%{reaction} by"
+  reportings:
+    index:
+      no_results_title_text: There are currently no status reportings.
+      no_results_content_text: Add a status reporting
+  statuses:
+    edit:
+      status_color_text: |
+        Click to assign or change the color of this status.
+        It is shown in the status button and can be used for highlighting work packages in the table.
+      status_default_text: New work packages are by default set to this type. They cannot be read-only.
+      status_excluded_from_totals_text: |-
+        Check this option to exclude work packages with this status from totals of Work,
+        Remaining work, and % Complete in a hierarchy.
+      status_percent_complete_text_html: |-
+        In [status-based progress calculation mode](setting_url), the % Complete of a work
+        package is automatically set to this value when this status is selected.
+        Ignored in work-based mode.
+      status_readonly_html: |
+        Check this option to mark work packages with this status as read-only.
+        No attributes can be changed with the exception of the status.
+        <br>
+        <strong>Note</strong>: Inherited values (e.g., from children or relations) will still apply.
+    index:
+      no_results_title_text: There are currently no work package statuses.
+      no_results_content_text: Add a new status
+      headers:
+        is_default: Default
+        is_closed: Closed
+        is_readonly: Read-only
+        excluded_from_totals: Excluded from totals
+  themes:
+    dark: Dark
+    light: Light
+    sync_with_os: Automatic (match OS color mode)
+  types:
+    index:
+      no_results_title_text: There are currently no types.
+      no_results_content_text: Create a new type
+    edit:
+      form_configuration:
+        tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
+      projects:
+        tab: Projects
+        enable_all: Enable for all projects
+        select_projects: Select projects
+        select_projects_description: Select the projects in which you would like to use this type.
+      settings:
+        tab: Settings
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: Subject configuration
+        manually_editable_subjects:
+          label: Manually editable subjects
+          caption: Users can manually enter and edit work package subjects without restrictions.
+        automatically_generated_subjects:
+          label: Automatically generated subjects
+          caption: Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects.
+        token:
+          label_with_context: "%{attribute_context}: %{attribute_label}"
+          context:
+            work_package: Work package
+            parent: Parent
+            project: Project
+        pattern:
+          label: Subject pattern
+          caption: Create patterns by adding text, or type "/" to search for [supported attributes](attributes_url).
+          insert_as_text: 'No attributes found. Add as text: "%{word}"'
+      export_configuration:
+        tab: Generate PDF
+        intro: Select which templates from those that are available you would like to enable for this type. The template determines the design and attributes visible in the exported PDF of a work package using this type. The first template on the list is selected by default.
+        pdf_export_templates:
+          label: PDF Export templates
+          actions:
+            label_enable_all: Enable all
+            label_disable_all: Disable all
+  versions:
+    overview:
+      work_packages_in_archived_projects: The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views.
+      no_results_title_text: There are currently no work packages assigned to this version.
+  wiki:
+    page_not_editable_index: The requested page does not (yet) exist. You have been redirected to the index of all wiki pages.
+    no_results_title_text: There are currently no wiki pages.
+    print_hint: This will print the content of this wiki page without any navigation bars.
+    index:
+      no_results_content_text: Add a new wiki page
+  workflows:
+    copies:
+      form:
+        source_role_id:
+          label: Source role
+        target_role_ids:
+          label: Target roles
+        target_type_ids:
+          label: Target types
+        mode:
+          from_role:
+            label: Copy to other roles
+            caption: Copy the current workflow to one or more roles inside the same work package type. If the selected role already has a workflow the current one will be overwritten.
+          from_type:
+            label: Copy to another type
+            caption: Copy the current workflow to another work packages type. If the selected type already has a workflow the current one will be overwritten. This affects all roles.
+      from_roles:
+        create:
+          notice:
+            one: Successfully copied workflow to '%{role_name}' role.
+            other: Successfully copied workflow to %{count} roles.
+      from_types:
+        create:
+          notice:
+            one: Successfully copied workflow to '%{type_name}' type.
+            other: Successfully copied workflow to %{count} types.
+      new:
+        title: Copy workflow of "%{source_type}"
+    form:
+      matrix_caption: Workflow matrix
+      matrix_caption_assignee: Workflow matrix for assignee
+      matrix_caption_author: Workflow matrix for author
+      matrix_checkbox_label: Allow transition from %{old_status} to %{new_status}
+      matrix_check_all_label: Allow all transitions
+      matrix_uncheck_all_label: Disallow all transitions
+      matrix_check_uncheck_all_in_row_label_html: Toggle transitions from <em>%{old_status}</em> to all new statuses
+      matrix_check_uncheck_all_in_col_label_html: Toggle transitions from all old statuses to <em>%{new_status}</em>
+    index:
+      type_filter:
+        label: Filter by type name…
+    page_headers:
+      index_component:
+        description: Configure status transitions for each work package type.
+  work_flows:
+    index:
+      no_results_title_text: There are currently no workflows.
+  work_packages:
+    delete_dialog:
+      title: Delete work package
+      heading: Permanently delete this work package?
+      description: Are you sure you want to delete the work package "%{name}"?
+      confirm_descendants_deletion: I acknowledge that ALL descendants of this work package will be recursively removed.
+      cross_project_warning: 'Work packages from the following projects will be deleted: %{projects}'
+    bulk_delete_dialog:
+      title: Delete %{count} work packages
+      heading: Permanently delete these %{count} work packages?
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
+      confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
+      cross_project_warning: 'These work packages span multiple projects: %{projects}'
+      children_label: 'The following children will also be deleted:'
+    datepicker_modal:
+      banner:
+        description:
+          automatic_mobile: Start date derived.
+          click_on_show_relations_to_open_gantt: Click on "%{button_name}" for Gantt overview.
+          manual_mobile: Ignoring relations.
+          manual_gap_between_predecessors: There is a gap between this and all predecessors.
+          manual_overlap_with_predecessors: Overlaps with at least one predecessor.
+          manual_with_children: This has child work packages but their start dates are ignored.
+        title:
+          automatic_mobile: Automatically scheduled.
+          automatic_with_children: The dates are determined by child work packages.
+          automatic_with_predecessor: The start date is set by a predecessor.
+          manual_mobile: Manually scheduled.
+          manually_scheduled: Manually scheduled. Dates not affected by relations.
+      blankslate:
+        title: No predecessors
+        description: To enable automatic scheduling, this work package needs to have at least one predecessor. It will then automatically be scheduled to start after the closest predecessor.
+      ignore_non_working_days:
+        title: Working days only
+      mode:
+        title: Scheduling mode
+        automatic: Automatic
+        manual: Manual
+      show_relations: Show relations
+      update_inputs_aria_live_message: Date picker updated. %{message}
+      tabs:
+        aria_label: Datepicker tabs
+        children: Children
+        dates: Dates
+        predecessors: Predecessors
+        successors: Successors
+        blankslate:
+          predecessors:
+            title: No predecessors
+            description: This work package does not have any predecessors.
+          successors:
+            title: No successors
+            description: This work package does not have any successors.
+          children:
+            title: No children
+            description: This work package does not have any children.
+    x_descendants:
+      one: One descendant work package
+      other: "%{count} work package descendants"
+    bulk:
+      copy_failed: The work packages could not be copied.
+      move_failed: The work packages could not be moved.
+      could_not_be_saved: 'The following work packages could not be saved:'
+      none_could_be_saved: None of the %{total} work packages could be updated.
+      x_out_of_y_could_be_saved: "%{failing} out of the %{total} work packages could not be updated while %{success} could."
+      selected_because_descendants: While %{selected} work packages were selected, in total %{total} work packages are affected which includes descendants.
+      descendant: descendant of selected
+    move:
+      no_common_statuses_exists: There is no status available for all selected work packages. Their status cannot be changed.
+      unsupported_for_multiple_projects: Bulk move/copy is not supported for work packages from multiple projects
+      current_type_not_available_in_target_project: 'The current type of the work package is not enabled in the target project. Please enable the type in the target project if you''d like it to remain unchanged. Otherwise, select an available type in the target project from the list.
+
+        '
+      bulk_current_type_not_available_in_target_project: 'The current types of the work packages aren''t enabled in the target project. Please enable the types in the target project if you''d like them to remain unchanged. Otherwise, select an available type in the target project from the list.
+
+        '
+    sharing:
+      missing_workflow_warning:
+        title: Workflow missing for work package sharing
+        message: No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role.
+        link_message: Configure the workflows in the administration.
+    summary:
+      reports:
+        category:
+          no_results_title_text: There are currently no categories available.
+        assigned_to:
+          no_results_title_text: There are currently no members part of this project.
+        responsible:
+          no_results_title_text: There are currently no members part of this project.
+        author:
+          no_results_title_text: There are currently no members part of this project.
+        priority:
+          no_results_title_text: There are currently no priorities available.
+        type:
+          no_results_title_text: There are currently no types available.
+        version:
+          no_results_title_text: There are currently no versions available.
+  work_package_relations_tab:
+    index:
+      action_bar_title: Add relations to other work packages to create a link between them.
+      no_results_title_text: There are currently no relations available.
+      blankslate_heading: No relations
+      blankslate_description: This work package does not have any relations yet.
+    label_add_child_button: Child
+    label_add_x: Add %{x}
+    label_edit_x: Edit %{x}
+    label_add_description: Add description
+    lag:
+      subject: Lag
+      caption: |-
+        The minimum number of working days to keep in between the two work packages.
+        It can also be negative.
+    relations:
+      label_new_child_created: New work package created and added as a child
+      label_relates_singular: related to
+      label_relates_plural: related to
+      label_relates_to_singular: related to
+      label_relates_to_plural: related to
+      relates_description: Creates a visible link between the two work packages with no additional effect
+      relates_to_description: Creates a visible link between the two work packages with no additional effect
+      label_precedes_singular: successor (after)
+      label_precedes_plural: successors (after)
+      precedes_description: The related work package necessarily needs to start after this one finishes
+      label_follows_singular: predecessor (before)
+      label_follows_plural: predecessors (before)
+      follows_description: The related work package necessarily needs to finish before this one can start
+      label_child_singular: child
+      label_child_plural: children
+      new_child: Create new child
+      new_child_description: Creates a related work package as a sub-item of the current (parent) work package
+      child: Child
+      child_description: Makes the related work package a sub-item of the current (parent) work package
+      parent: Parent
+      parent_description: Makes the related work package a parent of the current (child) work package
+      label_closest: Closest
+      label_blocks_singular: blocks
+      label_blocks_plural: blocks
+      blocks_description: The related work package cannot be closed until this one is closed first
+      label_blocked_singular: blocked by
+      label_blocked_plural: blocked by
+      label_blocked_by_singular: blocked by
+      label_blocked__by_plural: blocked by
+      blocked_description: This work package cannot be closed until the related one is closed first
+      blocked_by_description: This work package cannot be closed until the related one is closed first
+      label_duplicates_singular: duplicates
+      label_duplicates_plural: duplicates
+      duplicates_description: This is a copy of the related work package
+      label_duplicated_singular: duplicated by
+      label_duplicated_plural: duplicated by
+      label_duplicated_by_singular: duplicated by
+      label_duplicated_by_plural: duplicated by
+      duplicated_by_description: The related work package is a copy of this
+      duplicated_description: The related work package is a copy of this
+      label_includes_singular: includes
+      label_includes_plural: includes
+      includes_description: Marks the related work package as including this one with no additional effect
+      label_partof_singular: part of
+      label_partof_plural: part of
+      label_part_of_singular: part of
+      label_part_of_plural: part of
+      partof_description: Marks the related work package as being part of this one with no additional effect
+      part_of_description: Marks the related work package as being part of this one with no additional effect
+      label_requires_singular: requires
+      label_requires_plural: requires
+      requires_description: Marks the related work package as a requirement to this one
+      label_required_singular: required by
+      label_required_plural: required by
+      required_description: Marks this work package as being a requirement to the related one
+      label_parent_singular: parent
+      label_parent_plural: parent
+      label_other_relations: Other relations
+      ghost_relation_title: Related work package
+      ghost_relation_description: This is not visible to you due to permissions.
+  label_invitation: Invitation
+  account:
+    delete: Delete account
+    delete_confirmation: Are you sure you want to delete the account?
+    deletion_pending: Account has been scheduled for deletion. Note that this process takes place in the background. It might take a few moments until the user is fully deleted.
+    deletion_info:
+      data_consequences:
+        other: All user-specific data will be deleted. The user's activity in shared views such as work packages and meetings will not be deleted but instead be associated with a generic 'Deleted user' that cannot be linked to the original account.
+        self: All user-specific data will be deleted. Your activity in shared views such as work packages and meetings will not be deleted but instead be associated with a generic 'Deleted user' that cannot be linked to your original account.
+      heading: Delete %{name}'s account?
+      login_consequences:
+        other: This account will immediately be removed from the system and the user will no longer be able to log in with their credentials.
+        self: Your account will immediately be removed from the system and you will no longer be able to log in using your credentials.
+    error_inactive_activation_by_mail: 'Your account has not yet been activated. To activate your account, click on the link that was emailed to you.
+
+      '
+    error_inactive_manual_activation: 'Your account has not yet been activated. Please wait for an administrator to activate your account.
+
+      '
+    error_self_registration_disabled: 'User registration is disabled on this system. Please ask an administrator to create an account for you.
+
+      '
+    error_self_registration_limited_provider: 'User registration is limited for the Single sign-on provider ''%{name}''. Please ask an administrator to activate the account for you or change the self registration limit for this provider.
+
+      '
+    login_with_auth_provider: or sign in with your existing account
+    signup_with_auth_provider: or sign up using
+    auth_source_login_html: Please login as <em>%{login}</em> to activate your account.
+    omniauth_login: Please login to activate your account.
+  actionview_instancetag_blank_option: Please select
+  activemodel:
+    attributes:
+      projects/copy_options:
+        dependencies: Dependencies
+  activerecord:
+    attributes:
+      work_package_semantic_alias:
+        identifier: Identifier
+        work_package: Work package
+      jira_import:
+        projects: Projects
+      import/jira:
+        name: Jira instance name
+        url: Jira instance URL
+        personal_access_token: Personal access token
+      import/jira_open_project_reference:
+        jira: Jira
+        jira_import: Jira Migrator
+      announcements:
+        show_until: Display until
+      attachment:
+        attachment_content: Attachment content
+        attachment_file_name: Attachment file name
+        content_type: Content-type
+        downloads: Downloads
+        file: File
+        filename: File
+        filesize: Size
+      attribute_help_text:
+        attribute_name: Attribute
+        help_text: Help text
+        caption: Caption
+      auth_provider:
+        scim_clients: SCIM clients
+      calculated_value_error:
+        error_code: Error code
+        customized_id: Customized ID
+        customized_type: Customized type
+      capability:
+        context: Context
+      changeset:
+        repository: Repository
+      comment:
+        commented: Commented
+      custom_action:
+        actions: Actions
+      custom_field:
+        allow_non_open_versions: Allow non-open versions
+        default_value: Default value
+        editable: Editable
+        field_format: Format
+        formula: Formula
+        is_filter: Used as a filter
+        is_for_all: For all projects
+        is_required: Required
+        max_length: Maximum length
+        min_length: Minimum length
+        content_right_to_left: Right-to-Left content
+        multi_value: Allow multi-select
+        possible_values: Possible values
+        regexp: Regular expression
+        searchable: Searchable
+        admin_only: Admin-only
+        has_comment: Add a comment text field
+      custom_value:
+        value: Value
+      design_color:
+        variable: Variable
+      doorkeeper/application:
+        uid: Client ID
+        secret: Client secret
+        owner: Owner
+        builtin: Builtin
+        enabled: Active
+        redirect_uri: Redirect URI
+        client_credentials_user_id: Client Credentials User ID
+        scopes: Scopes
+        confidential: Confidential
+      emoji_reaction:
+        reactable: Reacted on
+      enterprise_token:
+        starts_at: Valid since
+        subscriber: Subscriber
+        subscription: Subscription
+        plan: Plan
+        encoded_token: Enterprise support token
+        active_user_count_restriction: Active users
+      enterprise_trial:
+        company: Company
+      favorite:
+        favorited: Item
+      grids/grid:
+        page: Page
+        row_count: Number of rows
+        column_count: Number of columns
+        widgets: Widgets
+      journal:
+        notes: Notes
+        cause_type: Cause type
+      ldap_auth_source:
+        account: Account
+        attr_firstname: Firstname attribute
+        attr_lastname: Lastname attribute
+        attr_login: Username attribute
+        attr_mail: Email attribute
+        filter_string: Filter string
+        admin: Administrator
+        base_dn: Base DN
+        host: Host
+        onthefly: Automatic user creation
+        port: Port
+        tls_certificate_string: LDAP server SSL certificate
+      mcp_configuration:
+        enabled: Enabled
+        title: Title
+        description: Description
+      member:
+        roles: Roles
+      notification:
+        read_ian: Read in-app
+        resource: Resource
+      oauth_client:
+        client: Client ID
+      project:
+        active_value:
+          true: unarchived
+          false: archived
+        attribute_groups: Attribute Groups
+        description: Description
+        enabled_modules: Enabled modules
+        identifier: Identifier
+        latest_activity_at: Latest activity at
+        parent: Subproject of
+        project_creation_wizard_enabled: Project initiation request
+        public_value:
+          title: Visibility
+          true: public
+          false: private
+        queries: Queries
+        status_code: Status
+        status_explanation: Status description
+        status_codes:
+          not_started: Not started
+          on_track: On track
+          at_risk: At risk
+          off_track: Off track
+          finished: Finished
+          discontinued: Discontinued
+        project_creation_wizard_assignee_custom_field: Assignee when submitted
+        project_creation_wizard_notification_text: Notification text
+        project_creation_wizard_send_confirmation_email: Confirmation email
+        project_creation_wizard_status_when_submitted: Status when submitted
+        project_creation_wizard_work_package_comment: Work package comment
+        project_creation_wizard_work_package_type: Work package type
+        template: Template
+        templated: Template project
+        templated_value:
+          true: marked as template
+          false: unmarked as template
+        types: Types
+        versions: Versions
+        work_packages: Work Packages
+        workspace_type: Workspace type
+      project_custom_field:
+        custom_field_section: Section
+      subproject_template_assignment:
+        workspace_type: Workspace type
+      project/phase:
+        date_range: Date range
+        definition: Definition
+        duration: Duration
+        start_date: Start date
+        start_date_caption: Follows the previous phase.
+        finish_date: Finish date
+      project/phase_definition:
+        name: Name
+        color: Color
+        start_gate: Start phase gate
+        start_gate_name: Start phase gate name
+        finish_gate: Finish phase gate
+        finish_gate_name: Finish phase gate name
+      query:
+        sums: Sums
+        columns: Columns
+        column_names: Columns
+        relations_to_type_column: Relations to %{type}
+        relations_of_type_column: "%{type} relations"
+        child_work_packages: Child work packages
+        group_by: Group results by
+        sort_by: Sort results by
+        filters: Filters
+        timeline_labels: Timeline labels
+        timeline_visible: Show Gantt chart
+        timeline_zoom_level: Gantt chart zoom level
+        timestamps: Baseline timestamps
+        sort_criteria: Sort criteria
+        highlighted_attributes: Highlighted attributes
+        highlighting_mode: Highlight mode
+        display_representation: Display mode
+        show_hierarchies: Display mode
+        starred: Favorite
+        hidden: Hidden
+        manual_sorting: Manual sort order
+        ordered_work_packages: Work packages order
+        include_subprojects: Include subprojects
+        results: Results
+      relation:
+        lag: Lag
+        from: Related work package
+        to: Related work package
+        relation_type: Relation type
+      reminder:
+        remindable: Reminded object
+        remind_at: Remind at
+        remind_at_date: Date
+        remind_at_time: Time
+      reminder_notification:
+        notification: Notification
+      repository:
+        url: URL
+      role:
+        permissions: Permissions
+      scim_client:
+        authentication_method: Authentication method
+        jwt_sub: Subject claim
+      status:
+        is_closed: Work package closed
+        is_readonly: Work package read-only
+        excluded_from_totals: Exclude from calculation of totals in hierarchy
+        default_done_ratio: "% Complete"
+      token/named:
+        token_name: Token name
+      token/ical:
+        calendar: Calendar
+        ical_token_query_assignment: Query assignment
+      time_entry:
+        activity: Activity
+        hours: Hours
+        spent_on: Date
+        type: Type
+        ongoing: Ongoing
+      type:
+        description: Default text for description
+        attribute_groups: Form configuration
+        is_in_roadmap: Displayed in roadmap by default
+        is_default: Activated for new projects by default
+        is_milestone: Is milestone
+        color: Color
+        patterns: Patterns
+      remote_identity:
+        auth_source: Auth Source
+        integration: Integration
+        user: User
+      user:
+        admin: Administrator
+        auth_source: Authentication source
+        ldap_auth_source: LDAP connection
+        identity_url: Identity URL
+        current_password: Current password
+        force_password_change: Enforce password change on next login
+        language: Language
+        last_login_on: Last login
+        failed_login_count: Failed login attempts
+        first_name: First name
+        last_name: Last name
+        first_login: First login
+        new_password: New password
+        password_confirmation: Confirmation
+        consented_at: Consented at
+      group:
+        identity_url: Identity URL
+        parent: Parent group
+        organizational_unit: Organizational unit
+        group_users: Group users
+      group_detail:
+        parent: Parent group
+        organizational_unit: Organizational unit
+      user_preference:
+        header_look_and_feel: Look and feel
+        header_alerts: Alerts
+        button_update_look_and_feel: Update look and feel
+        button_update_alerts: Update alerts
+        button_update_user_information: Update profile
+        comments_sorting: Display work package activity sorted by
+        disable_keyboard_shortcuts: Disable keyboard shortcuts
+        dismissed_enterprise_banners: Hidden enterprise banners
+        impaired: Accessibility mode
+        auto_hide_popups: Automatically hide success banners
+        auto_hide_popups_caption: When enabled, the green success banners will automatically disappear after 5 seconds.
+        warn_on_leaving_unsaved: Warn me when leaving a work package with unsaved changes
+        increase_theme_contrast: Increase theme contrast
+        increase_contrast: Increase contrast
+        increase_contrast_caption: Enables high-contrast mode for the chosen colour mode.
+        force_light_theme_contrast: Force high-contrast when in Light mode
+        force_dark_theme_contrast: Force high-contrast when in Dark mode
+        force_light_theme_contrast_caption: Uses the high-contrast version of Light mode when automatic color mode is selected.
+        force_dark_theme_contrast_caption: Uses the high-contrast version of Dark mode when automatic color mode is selected.
+        theme: Color mode
+        time_zone: Time zone
+        mode_guideline: Some modes will overwrite custom theme colors for accessibility and legibility. Please select Light mode for full custom theme support.
+        daily_reminders: Daily reminders
+        workdays: Working days
+      users/invitation/form_model:
+        principal_type: Invitation type
+        id_or_email: Name or email address
+      user_non_working_time:
+        start_date: Start date
+        end_date: End date
+      user_working_hours:
+        valid_from: Valid from
+        monday: Monday
+        monday_hours: Monday hours
+        tuesday: Tuesday
+        tuesday_hours: Tuesday hours
+        wednesday: Wednesday
+        wednesday_hours: Wednesday hours
+        thursday: Thursday
+        thursday_hours: Thursday hours
+        friday: Friday
+        friday_hours: Friday hours
+        saturday: Saturday
+        saturday_hours: Saturday hours
+        sunday: Sunday
+        sunday_hours: Sunday hours
+        availability_factor: Availability factor
+        shared_hours: Work hours
+        days: Working days
+      version:
+        effective_date: Finish date
+        sharing: Sharing
+      wiki_content:
+        text: Text
+      wiki_page:
+        parent_title: Parent page
+        redirect_existing_links: Redirect existing links
+        text: Page content
+      work_package:
+        ancestor: Descendants of
+        begin_insertion: Begin of the insertion
+        begin_deletion: Begin of the deletion
+        children: Subelements
+        derived_done_ratio: Total % complete
+        derived_remaining_hours: Total remaining work
+        derived_remaining_time: Total remaining work
+        done_ratio: "% Complete"
+        duration: Duration
+        end_insertion: End of the insertion
+        end_deletion: End of the deletion
+        identifier: Identifier
+        ignore_non_working_days: Ignore non working days
+        include_non_working_days:
+          title: Working days
+          false: working days only
+          true: include non-working days
+        journal_internal: Internal Journal
+        notify: Notify
+        parent: Parent
+        parent_issue: Parent
+        parent_work_package: Parent
+        priority: Priority
+        progress: "% Complete"
+        readonly: Read only
+        remaining_hours: Remaining work
+        remaining_time: Remaining work
+        sequence_number: Sequence number
+        shared_with_users: Shared with
+        schedule_manually: Manual scheduling
+        spent_hours: Spent time
+        spent_time: Spent time
+        subproject: Subproject
+        time_entries: Log time
+        type: Type
+        version: Version
+        watcher: Watcher
+      ordered_persisted_query_entity:
+        persisted_query: Persisted query
+        entity: Entity
+        position: Position
+      persisted_query:
+        name: Name
+        views: Views
+        filters: Filters
+        orders: Orders
+        selects: Selects
+      persisted_view:
+        name: Name
+        query: Query
+        parent: Parent view
+        public: Public
+      user_card_view:
+        secondary_info: Secondary info
+        show_status_badge: Show status badge
+        show_email: Show email
+        tag_source: Tag source
+        tag_limit: Tag limit
+        card_size: Card size
+        columns_per_row: Columns per row
+    errors:
+      messages:
+        accepted: must be accepted.
+        after: must be after %{date}.
+        after_today: must be in the future.
+        after_or_equal_to: must be after or equal to %{date}.
+        before: must be before %{date}.
+        before_or_equal_to: must be before or equal to %{date}.
+        blank: can't be blank.
+        not_before_start_date: must not be before the start date.
+        overlapping_range: overlaps with an existing non-working day range.
+        blank_nested: needs to have the property '%{property}' set.
+        cannot_delete_mapping: is required. Cannot be deleted.
+        is_for_all_cannot_modify: is for all projects and can therefore not be modified.
+        cant_link_a_work_package_with_a_descendant: A work package cannot be linked to one of its subtasks.
+        circular_dependency: This relation would create a circular dependency.
+        confirmation: doesn't match %{attribute}.
+        could_not_be_copied: "%{dependency} could not be (fully) copied."
+        does_not_exist: does not exist.
+        user_already_in_department: User %{user_id} is already a member of department %{department_id}.
+        error_enterprise_only: "%{action} is only available in the OpenProject Enterprise edition."
+        error_unauthorized: may not be accessed.
+        error_readonly: was attempted to be written but is not writable.
+        error_conflict: Information has been updated by at least one other user in the meantime.
+        error_not_found: not found.
+        email: is not a valid email address.
+        empty: can't be empty.
+        enterprise_plan_required: requires at least the %{plan_name}.
+        even: must be even.
+        exclusion: is reserved.
+        feature_disabled: is not available.
+        feature_disabled_for_project: is disabled for this project.
+        file_too_large: is too large (maximum size is %{count} Bytes).
+        filter_does_not_exist: filter does not exist.
+        format: does not match the expected format '%{expected}'.
+        format_nested: does not match the expected format '%{expected}' at path '%{path}'.
+        greater_than: must be greater than %{count}.
+        greater_than_or_equal_to: must be greater than or equal to %{count}.
+        greater_than_or_equal_to_start_date: must be greater than or equal to the start date.
+        greater_than_start_date: must be greater than the start date.
+        inclusion: is not set to one of the allowed values.
+        inclusion_nested: is not set to one of the allowed values at path '%{path}'.
+        invalid: is invalid.
+        invalid_uri: must be a valid URI.
+        invalid_url: is not a valid URL.
+        invalid_url_scheme: 'is not a supported protocol (allowed: %{allowed_schemes}).'
+        less_than_or_equal_to: must be less than or equal to %{count}.
+        not_available: is not available due to a system configuration.
+        not_deletable: cannot be deleted.
+        not_editable: cannot be edited because it is already in effect.
+        not_current_user: is not the current user.
+        system_wide_non_working_day_exists: conflicts with an existing system-wide non-working day for this date.
+        not_found: not found.
+        not_a_date: is not a valid date.
+        not_a_datetime: is not a valid date time.
+        not_a_number: is not a number.
+        not_allowed: is invalid because of missing permissions.
+        host_not_allowed: is not an allowed host.
+        not_json: is not parseable as JSON.
+        not_json_object: is not a JSON object.
+        not_an_integer: is not an integer.
+        not_an_iso_date: 'is not a valid date. Required format: YYYY-MM-DD.'
+        not_same_project: doesn't belong to the same project.
+        datetime_must_be_in_future: must be in the future.
+        odd: must be odd.
+        regex_match_failed: does not match the regular expression %{expression}.
+        regex_invalid: could not be validated with the associated regular expression.
+        regex_list_invalid: Lines %{invalid_lines} could not be parsed as regular expression.
+        hexcode_invalid: is not a valid 6-digit hexadecimal color code.
+        smaller_than_or_equal_to_max_length: must be smaller than or equal to maximum length.
+        taken: has already been taken.
+        too_long: is too long (maximum is %{count} characters).
+        too_short: is too short (minimum is %{count} characters).
+        type_mismatch: is not of type '%{type}'
+        type_mismatch_nested: is not of type '%{type}' at path '%{path}'
+        unchangeable: cannot be changed.
+        unknown_property: is not a known property.
+        unknown_property_nested: has the unknown path '%{path}'.
+        unremovable: cannot be removed.
+        url_not_secure_context: 'is not providing a "Secure Context". Either use HTTPS or a loopback address, such as localhost.
+
+          '
+        wrong_length: is the wrong length (should be %{count} characters).
+      models:
+        group:
+          attributes:
+            parent_id:
+              circular_dependency: would create a circular group hierarchy.
+              organizational_unit_mismatch: must have the same organizational unit setting as the group.
+        ldap_auth_source:
+          attributes:
+            tls_certificate_string:
+              invalid_certificate: 'The provided SSL certificate is invalid: %{additional_message}'
+              format: "%{message}"
+        attachment:
+          attributes:
+            content_type:
+              blank: The content type of the file cannot be blank.
+              not_allowlisted: The file was rejected by an automatic filter. '%{value}' is not allowed for upload.
+              format: "%{message}"
+        capability:
+          context:
+            global: Global
+          query:
+            filters:
+              minimum: need to include at least one filter for principal, context or id with the '=' operator.
+        custom_field:
+          at_least_one_custom_option: At least one option needs to be available.
+          previous_custom_field_recalculation_unprocessed: The recalculation of previous changes for this custom field have not been applied yet, please try again in a few minutes.
+          referenced_in_other_fields_html:
+            one: "%{name} is used in project attribute calculation %{links}."
+            other: "%{name} is used in project attribute calculations: %{links}."
+          attributes:
+            formula:
+              blank: Formula can't be blank.
+              invalid: Formula is invalid.
+              invalid_characters: Only numeric values, mathematical operators and project attributes of type integer, float, calculated value and weighted list are allowed.
+              not_allowed_custom_fields_referenced: The attribute %{custom_fields} cannot be used because it leads to a circular reference; one attribute depends on the other.
+              format: "%{message}"
+            required:
+              cannot_be_true: cannot be set to true.
+        custom_fields_project:
+          attributes:
+            project_ids:
+              blank: Please select a project.
+        custom_actions:
+          only_one_allowed: "(%{name}) only one value is allowed."
+          empty: "(%{name}) value can't be empty."
+          inclusion: "(%{name}) value is not set to one of the allowed values."
+          not_logged_in: "(%{name}) value cannot be set because you are not logged in."
+          not_an_integer: "(%{name}) is not an integer."
+          smaller_than_or_equal_to: "(%{name}) must be smaller than or equal to %{count}."
+          greater_than_or_equal_to: "(%{name}) must be greater than or equal to %{count}."
+          format: "%{message}"
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: cannot contain a fragment.
+              invalid_uri: must be a valid URI.
+              relative_uri: must be an absolute URI.
+              secured_uri: is not providing a "Secure Context". Either use HTTPS or a loopback address, such as localhost.
+              forbidden_uri: is forbidden by the server.
+            scopes:
+              not_match_configured: doesn't match available scopes.
+        enterprise_trial:
+          already_used: was already used to create a trial.
+          failed_to_create: Trial could not be created (%{status})
+          general_consent: Please accept the terms and conditions.
+        enterprise_token:
+          only_one_trial: Only one trial token can be active. Please delete the previous trial token before adding another.
+          unreadable: can't be read. Are you sure it is a support token?
+          already_added: This token has already been added.
+        favorite:
+          already_favorited: has already been favorited.
+        grids/grid:
+          overlaps: overlap.
+          outside: is outside of the grid.
+          end_before_start: end value needs to be larger than the start value.
+        ical_token_query_assignment:
+          attributes:
+            name:
+              blank: is mandatory. Please select a name.
+              not_unique: is already in use. Please select another name.
+        meeting:
+          error_conflict: Unable to save because the meeting was updated by someone else in the meantime. Please reload the page.
+        message:
+          cannot_move_message_to_forum_of_different_project: A message cannot be moved to a forum of a different project.
+        notifications:
+          at_least_one_channel: At least one channel for sending notifications needs to be specified.
+          attributes:
+            read_ian:
+              read_on_creation: cannot be set to true on notification creation.
+            mail_reminder_sent:
+              set_on_creation: cannot be set to true on notification creation.
+            reason:
+              no_notification_reason: cannot be blank as IAN is chosen as a channel.
+            reason_mail_digest:
+              no_notification_reason: cannot be blank as mail digest is chosen as a channel.
+        non_working_day:
+          attributes:
+            date:
+              taken: A non-working day already exists for %{value}.
+              format: "%{message}"
+        parse_schema_filter_params_service:
+          attributes:
+            base:
+              unsupported_operator: The operator is not supported.
+              invalid_values: A value is invalid.
+              id_filter_required: An 'id' filter is required.
+        project:
+          archived_ancestor: The project has an archived ancestor.
+          foreign_wps_reference_version: Work packages in non descendant projects reference versions of the project or its descendants.
+          cannot_be_assigned_to_artifact_work_package: The chosen user is not allowed to be assigned to work packages.
+          attributes:
+            base:
+              archive_permission_missing_on_subprojects: You do not have the permissions required to archive all sub-projects. Please contact an administrator.
+              project_initiation_request_disabled: Project initiation request is disabled. It must be enabled to create the artifact work package.
+            types:
+              in_use_by_work_packages: 'still in use by work packages: %{types}'
+            identifier:
+              must_start_with_letter: must start with a letter
+              no_special_characters: may only contain uppercase letters, numbers, and underscores
+            enabled_modules:
+              dependency_missing: The module '%{dependency}' needs to be enabled as well since the module '%{module}' depends on it.
+              format: "%{message}"
+        project_custom_field_project_mapping:
+          attributes:
+            project_ids:
+              blank: Please select a project.
+        project/phase:
+          attributes:
+            start_date:
+              must_be_before_finish_date: must be before the finish date.
+              non_continuous_dates: can't be earlier than the previous phase's end date.
+            finish_date:
+              must_be_after_start_date: must be after the start date.
+          cannot_be_a_non_working_day: can't be a non-working day.
+        query:
+          attributes:
+            public:
+              error_unauthorized: "- The user has no permission to create public views."
+            group_by:
+              invalid: 'Can''t group by: %{value}'
+              format: "%{message}"
+            column_names:
+              invalid: 'Invalid query column: %{value}'
+              format: "%{message}"
+            sort_criteria:
+              invalid: 'Can''t sort by column: %{value}'
+              format: "%{message}"
+            timestamps:
+              invalid: 'Timestamps contain invalid values: %{values}'
+              forbidden: 'Timestamps contain forbidden values: %{values}'
+              format: "%{message}"
+            selects:
+              name_not_included: The 'Name' column needs to be included
+              nonexistent: The column '%{column}' does not exist.
+              format: "%{message}"
+          group_by_hierarchies_exclusive: is mutually exclusive with group by '%{group_by}'. You cannot activate both.
+          can_only_be_modified_by_owner: The query can only be modified by its owner.
+          need_permission_to_modify_public_query: You cannot modify a public query.
+          filters:
+            custom_fields:
+              inexistent: There is no custom field for the filter.
+        queries/filters/base:
+          attributes:
+            values:
+              inclusion: filter has invalid values.
+              format: "%{message}"
+        queries/principals/filters/internal_mentionable_on_work_package_filter:
+          attributes:
+            values:
+              single_value_requirement: must be a single work package
+        relation:
+          typed_dag:
+            circular_dependency: The relationship creates a circle of relationships.
+          attributes:
+            base:
+              error_not_deletable: This relation cannot be deleted because you do not have edit permissions for the selected work package.
+              error_not_editable: This relation cannot be edited because you do not have edit permissions for the selected work package.
+            to_id:
+              format: The selected work package %{message}
+              error_not_found: could not be found.
+              error_readonly: cannot be changed for existing relations.
+              error_not_manageable: cannot be added because you do not have edit permissions for the selected work package.
+            from_id:
+              format: The selected work package %{message}
+              error_not_found: could not be found.
+              error_readonly: cannot be changed for existing relations.
+              error_not_manageable: cannot be added because you do not have edit permissions for the selected work package.
+        repository:
+          not_available: SCM vendor is not available
+          not_whitelisted: is not allowed by the configuration.
+          invalid_url: is not a valid repository URL or path.
+          must_not_be_ssh: must not be an SSH url.
+          must_not_point_to_openproject_directory: must not point to an OpenProject-managed repository directory.
+          no_directory: is not a directory.
+        role:
+          attributes:
+            permissions:
+              dependency_missing: need to also include '%{dependency}' as '%{permission}' is selected.
+        setting:
+          attributes:
+            base:
+              working_days_are_missing: At least one day of the week must be defined as a working day.
+              previous_working_day_changes_unprocessed: The previous changes to the working days configuration have not been applied yet.
+              hours_per_day_are_missing: The number of hours per day must be defined.
+              durations_are_not_positive_numbers: The durations must be positive numbers.
+              hours_per_day_is_out_of_bounds: Hours per day can't be more than 24
+        status:
+          attributes:
+            default_done_ratio:
+              inclusion: must be between 0 and 100.
+          readonly_default_exlusive: can not be activated for statuses that are marked default.
+        time_entry:
+          attributes:
+            hours:
+              day_limit: is too high as a maximum of 24 hours can be logged per date.
+        user_preference:
+          attributes:
+            pause_reminders:
+              invalid_range: can only be a valid date range.
+            daily_reminders:
+              full_hour: can only be configured to be delivered at a full hour.
+            notification_settings:
+              only_one_global_setting: There must only be one global notification setting.
+              email_alerts_global: The email notification settings can only be set globally.
+              format: "%{message}"
+              wrong_date: Wrong value for Start date, Due date, or Overdue.
+        watcher:
+          attributes:
+            user_id:
+              not_allowed_to_view: is not allowed to view this resource.
+              locked: is locked.
+        wiki_page:
+          error_conflict: The wiki page has been updated by someone else while you were editing it.
+          attributes:
+            slug:
+              undeducible: cannot be deduced from the title '%{title}'.
+        work_package:
+          is_not_a_valid_target_for_time_entries: 'Work package #%{id} is not a valid target for reassigning the time entries.'
+          attributes:
+            id:
+              format: "%{message}"
+              cannot_add_child_because_of_lack_of_permission: Cannot add child because you don't have permissions to edit the selected work package.
+              blank: ID can't be blank.
+            identifier:
+              semantic_identifier_incomplete: and sequence_number must both be set at the same time.
+            assigned_to:
+              format: "%{message}"
+            done_ratio:
+              does_not_match_work_and_remaining_work: does not match Work and Remaining work
+              cannot_be_set_when_work_is_zero: cannot be set when Work is 0h
+              must_be_set_when_remaining_work_is_set: required when Remaining work is set.
+              must_be_set_when_work_and_remaining_work_are_set: required when Work and Remaining work are set.
+              inclusion: must be between 0 and 100.
+            due_date:
+              not_start_date: is not on start date, although this is required for milestones.
+              cannot_be_null: can not be set to null as start date and duration are known.
+            duration:
+              larger_than_dates: is larger than the interval between the start and the finish date.
+              smaller_than_dates: is smaller than the interval between the start and the finish date.
+              not_available_for_milestones: is not available for milestone typed work packages.
+              cannot_be_null: can not be set to null as start date and finish date are known.
+              not_an_integer: is not a valid duration.
+            parent:
+              cannot_be_milestone: cannot be a milestone.
+              cannot_be_self_assigned: cannot be assigned to itself.
+              cannot_be_in_another_project: cannot be in another project.
+              not_a_valid_parent: is invalid.
+            schedule_manually:
+              cannot_be_automatically_scheduled: cannot be set to false (automatically scheduled) as it has no predecessors or children.
+            start_date:
+              violates_relationships: can only be set to %{soonest_start} or later so as not to violate the work package's relationships.
+              cannot_be_null: can not be set to null as finish date and duration are known.
+            status_id:
+              status_transition_invalid: is invalid because no valid transition exists from old to new status for the current user's roles.
+              status_invalid_in_type: is invalid because the current status does not exist in this type.
+            type:
+              cannot_be_milestone_due_to_children: cannot be a milestone because this work package has children.
+            priority_id:
+              only_active_priorities_allowed: needs to be active.
+            category:
+              only_same_project_categories_allowed: The category of a work package must be within the same project as the work package.
+              does_not_exist: The specified category does not exist.
+            estimated_hours:
+              not_a_number: is not a valid duration.
+              cant_be_inferior_to_remaining_work: cannot be lower than Remaining work.
+              must_be_set_when_remaining_work_and_percent_complete_are_set: required when Remaining work and % Complete are set.
+            remaining_hours:
+              not_a_number: is not a valid duration.
+              cant_exceed_work: cannot be higher than Work.
+              must_be_set_when_work_is_set: required when Work is set.
+              must_be_set_when_work_and_percent_complete_are_set: required when Work and % Complete are set.
+              must_be_set_to_zero_hours_when_work_is_set_and_percent_complete_is_100p: ">- must be 0h when Work is set and % Complete is 100%."
+              must_be_empty_when_work_is_empty_and_percent_complete_is_100p: must be empty when Work is empty and % Complete is 100%.
+          readonly_status: The work package is in a readonly status so its attributes cannot be changed.
+        type:
+          attributes:
+            attribute_groups:
+              attribute_unknown: Invalid work package attribute used.
+              attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
+              duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
+              query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
+              group_without_name: Group name can't be blank.
+            patterns:
+              invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
+        user:
+          attributes:
+            base:
+              user_limit_reached: User limit reached. No more accounts can be created on the current plan.
+              one_must_be_active: Admin User cannot be locked/removed. At least one admin must be active.
+            password_confirmation:
+              confirmation: Password confirmation does not match password.
+              format: "%{message}"
+            password:
+              requirements_not_met: 'Must include characters of the following types: %{rules}'
+              lowercase: lowercase (e.g. 'a')
+              uppercase: uppercase (e.g. 'A')
+              numeric: numeric (e.g. '1')
+              special: special (e.g. '%')
+              reused:
+                one: has been used before. Please choose one that is different from your last one.
+                other: has been used before. Please choose one that is different from your last %{count}.
+              match:
+                confirm: Confirm new password.
+                description: "'Password confirmation' should match the input in the 'New password' field."
+            status:
+              invalid_on_create: is not a valid status for new users.
+        user_working_hours:
+          attributes:
+            days:
+              no_working_day: At least one day needs to be configured as a working day.
+        member:
+          principal_blank: Please choose at least one user or group.
+          role_blank: need to be assigned.
+          attributes:
+            roles:
+              ungrantable: has an unassignable role.
+              more_than_one: has more than one role.
+            principal:
+              unassignable: cannot be assigned to a project.
+        version:
+          undeletable_archived_projects: The version cannot be deleted as it has work packages attached to it.
+          undeletable_work_packages_attached: The version cannot be deleted as it has work packages attached to it.
+        token/named:
+          attributes:
+            token_name:
+              blank: Please provide a token name
+              in_use: This token name is already in use, please select a different one
+              format: "%{message}"
+        jira:
+          invalid_protocol: Please provide a valid protocol (http or https)
+      template:
+        body: 'Please check the following fields:'
+        header:
+          one: 1 error prohibited this %{model} from being saved
+          other: "%{count} errors prohibited this %{model} from being saved"
+    models:
+      attachment: File
+      attribute_help_text:
+        one: Attribute help text
+        other: Attribute help texts
+      auth_provider:
+        one: Authentication provider
+        other: Authentication providers
+      category: Category
+      color: Color
+      comment: Comment
+      custom_action: Custom action
+      custom_field: Custom field
+      customized: Customized
+      doorkeeper/application: OAuth application
+      enterprise_token:
+        one: Enterprise token
+        other: Enterprise tokens
+      forum: Forum
+      global_role: Global role
+      group: Group
+      issue_priority:
+        one: Priority
+        other: Priorities
+      meeting_participant: Meeting participant
+      member: Member
+      news: News
+      notification:
+        one: Notification
+        other: Notifications
+      placeholder_user: Placeholder user
+      project:
+        one: Project
+        other: Projects
+      project_query:
+        one: Project list
+        other: Project lists
+      query: Custom query
+      reminder: Reminder
+      role:
+        one: Role
+        other: Roles
+      scim_client:
+        one: SCIM client
+        other: SCIM clients
+      jira:
+        one: Jira
+        other: Jira
+      status: Work package status
+      token/api:
+        one: Access token
+        other: Access tokens
+      token/rss:
+        one: RSS token
+        other: RSS tokens
+      type:
+        one: Type
+        other: Types
+      user: User
+      version: Version
+      workflow: Workflow
+      work_package: Work package
+      wiki: Wiki
+      wiki_page: Wiki page
+  errors:
+    header_invalid_fields:
+      one: 'There was a problem with the following field:'
+      other: 'There were problems with the following fields:'
+    header_additional_invalid_fields:
+      one: 'Additionally, there was a problem with the following field:'
+      other: 'Additionally, there were problems with the following fields:'
+    field_erroneous_label: |-
+      This field is invalid: %{full_errors}
+      Please enter a valid value.
+    messages:
+      must_be_template: must be template
+      unsupported_storage_type: is not a supported storage type.
+      storage_error: There was an error with the storage connection.
+      invalid_input: The input is invalid.
+      invalid_child_for_parent: is not allowed as a parent for this view type.
+  activity:
+    item:
+      created_by_on: created by %{user} on %{datetime}
+      created_by_on_time_entry: time logged by %{user} on %{datetime}
+      created_on: created on %{datetime}
+      created_on_time_entry: time logged on %{datetime}
+      updated_by_on: updated by %{user} on %{datetime}
+      updated_by_on_time_entry: logged time updated by %{user} on %{datetime}
+      updated_on: updated on %{datetime}
+      updated_on_time_entry: logged time updated on %{datetime}
+      deleted_on: deleted on %{datetime}
+      deleted_by_on: deleted by %{user} on %{datetime}
+      added_on: added on %{datetime}
+      added_by_on: added by %{user} on %{datetime}
+      removed_on: removed on %{datetime}
+      removed_by_on: removed by %{user} on %{datetime}
+      parent_without_of: Subproject
+      parent_no_longer: No longer subproject of
+      time_entry:
+        hour:
+          one: "%{count} hour"
+          other: "%{count} hours"
+        hour_html:
+          one: "<i>%{count} hour</i>"
+          other: "<i>%{count} hours</i>"
+        updated: changed from %{old_value} to %{value}
+        logged_for: Logged for
+    filter:
+      changeset: Changesets
+      message: Forums
+      news: News
+      project_details: Project details
+      subproject: Include subprojects
+      time_entry: Spent time
+      wiki_edit: Wiki
+      work_package: Work packages
+    project_phase:
+      activated: activated
+      added_date: set to %{date}
+      changed_date: changed from %{from} to %{to}
+      deactivated: deactivated
+      deleted_project_phase: Deleted project phase
+      phase_and_both_gates: "%{phase_message}. %{start_gate_message}, and %{finish_gate_message}"
+      phase_and_one_gate: "%{phase_message}. %{gate_message}"
+      removed_date: date deleted %{date}
+  attributes:
+    active: Active
+    assigned_to: Assignee
+    assignee: Assignee
+    attachments: Attachments
+    actor: Actor
+    action: Action
+    api_key: API key
+    author: Author
+    avatar: Avatar
+    base: 'General Error:'
+    body: Body
+    category: Category
+    comment: Comment
+    comments: Comment
+    content: Content
+    color: Color
+    creator: Creator
+    created_at: Created on
+    custom_field: Custom field
+    custom_options: Possible values
+    custom_values: Custom fields
+    date: Date
+    dates_interval: Date range
+    default_columns: Default columns
+    description: Description
+    derived_due_date: Derived finish date
+    derived_estimated_hours: Total work
+    derived_start_date: Derived start date
+    direction: Direction
+    display_sums: Display Sums
+    domain: Domain
+    due_date: Finish date
+    estimated_hours: Work
+    estimated_time: Work
+    email: Email
+    entity_type: Entity
+    expires_at: Expires on
+    firstname: First name
+    filter: Filter
+    group: Group
+    groups: Groups
+    hexcode: Hex code
+    id: ID
+    is_default: Default value
+    is_for_all: For all projects
+    public: Public
+    principal: User or group
+    issue: Work package
+    journal: Journal
+    journal_notes: Comment
+    lastname: Last name
+    login: Username
+    lock_version: Lock version
+    mail: Email
+    name: Name
+    note: Note
+    notes: Notes
+    number: Number
+    options: Options
+    operator: Operator
+    password: Password
+    priority: Priority
+    project: Project
+    project_ids: Project IDs
+    project_phase: Project phase
+    project_phase_definition: Project phase
+    reason: Reason
+    responsible: Accountable
+    required: Required
+    recipient: Recipient
+    role: Role
+    roles: Roles
+    search: Search
+    sprint: Sprint
+    start_date: Start date
+    status: Status
+    state: State
+    subject: Subject
+    slug: Slug
+    summary: Summary
+    template: Template
+    time_zone: Time zone
+    text: Text
+    title: Title
+    type: Type
+    typeahead: Autocomplete
+    uid: Unique identifier
+    updated_at: Updated on
+    updated_on: Updated on
+    uploader: Uploader
+    user: User
+    username: Username
+    unit: Unit
+    value: Value
+    values: Values
+    version: Version
+    visible: Visible
+    work_package: Work package
+    work_package_id: Work package
+  backup:
+    failed: Backup failed
+    label_backup_token: Backup token
+    label_create_token: Create backup token
+    label_delete_token: Delete backup token
+    label_reset_token: Reset backup token
+    label_token_users: The following users have active backup tokens
+    reset_token:
+      action_create: Create
+      action_reset: Reset
+      heading_reset: Reset backup token
+      heading_create: Create backup token
+      implications: 'Enabling backups will allow any user with the required permissions and this backup token to download a backup containing all data of this OpenProject installation. This includes the data of all other users.
+
+        '
+      info: 'You will need to generate a backup token to be able to create a backup. Each time you want to request a backup you will have to provide this token. You can delete the backup token to disable backups for this user.
+
+        '
+      verification_html: 'Enter %{word} to confirm you want to %{action} the backup token.
+
+        '
+      verification_word_reset: reset
+      verification_word_create: create
+      warning: 'When you create a new token you will only be allowed to request a backup after 24 hours. This is a safety measure. After that you can request a backup any time using that token.
+
+        '
+    text_token_deleted: Backup token deleted. Backups are now disabled.
+    error:
+      invalid_token: Invalid or missing backup token
+      token_cooldown: The backup token will be valid in %{hours} hours.
+      backup_pending: There is already a backup pending.
+      limit_reached: You can only do %{limit} backups per day.
+  button_actions: Actions
+  button_add: Add
+  button_add_comment: Add comment
+  button_add_item_above: Add item above
+  button_add_item_below: Add item below
+  button_add_sub_item: Add sub-item
+  button_add_member: Add member
+  button_add_watcher: Add watcher
+  button_annotate: Annotate
+  button_apply: Apply
+  button_apply_changes: Apply changes
+  button_archive: Archive
+  button_back: Back
+  button_cancel: Cancel
+  button_change: Change
+  button_change_parent_page: Change parent page
+  button_change_password: Change password
+  button_check_all: Check all
+  button_clear: Clear
+  button_click_to_reveal: Click to reveal
+  button_close: Close
+  button_collapse_all: Collapse all
+  button_confirm: Confirm
+  button_configure: Configure
+  button_continue: Continue
+  button_complete: Complete
+  button_copy: Copy
+  button_copy_to_clipboard: Copy to clipboard
+  button_copy_link_to_clipboard: Copy link to clipboard
+  button_create: Create
+  button_create_and_continue: Create and continue
+  button_decline: Decline
+  button_delete: Delete
+  button_delete_permanently: Delete permanently
+  button_delete_watcher: Delete watcher %{name}
+  button_download: Download
+  button_disable: Disable
+  button_duplicate: Duplicate
+  button_duplicate_and_follow: Duplicate and follow
+  button_edit: Edit
+  button_enable: Enable
+  button_edit_associated_wikipage: 'Edit associated wiki page: %{page_title}'
+  button_expand_all: Expand all
+  button_favorite: Add to favorites
+  button_filter: Filter
+  button_finish_setup: Finish setup
+  button_generate: Generate
+  button_list: List
+  button_lock: Lock
+  button_login: Sign in
+  button_move: Move
+  button_move_and_follow: Move and follow
+  button_print: Print
+  button_quote: Quote
+  button_remove: Remove
+  button_remove_permanently: Remove permanently
+  button_remove_reminder: Remove reminder
+  button_rename: Rename
+  button_replace: Replace
+  button_revoke: Revoke
+  button_reply: Reply
+  button_reset: Reset
+  button_rollback: Rollback to this version
+  button_save: Save
+  button_save_as: Save as
+  button_save_back: Save and back
+  button_select: Select
+  button_set_reminder: Set reminder
+  button_show: Show
+  button_sort: Sort
+  button_submit: Submit
+  button_test: Test
+  button_unarchive: Unarchive
+  button_uncheck_all: Uncheck all
+  button_unlock: Unlock
+  button_unfavorite: Remove from favorites
+  button_unwatch: Unwatch
+  button_update: Update
+  button_upgrade: Upgrade
+  button_buy_now: Buy now
+  button_upload: Upload
+  button_view: View
+  button_watch: Watch
+  button_manage_menu_entry: Configure menu item
+  button_add_menu_entry: Add menu item
+  button_configure_menu_entry: Configure menu item
+  button_delete_menu_entry: Delete menu item
+  button_view_shared_work_packages: View shared work packages
+  button_manage_roles: Manage roles
+  button_remove_member: Remove member
+  button_remove_member_and_shares: Remove member and shares
+  button_revoke_work_package_shares: Revoke work package shares
+  button_revoke_access: Revoke access
+  button_revoke_all: Revoke all
+  button_revoke_only: Revoke only %{shared_role_name}
+  button_publish: Make public
+  button_unpublish: Make private
+  consent:
+    checkbox_label: I have noted and do consent to the above.
+    failure_message: Consent failed, cannot proceed.
+    title: User Consent
+    decline_warning_message: You have declined to consent and have been logged out.
+    user_has_consented: The user gave their consent to your [configured consent information text](consent_settings).
+    not_yet_consented: The user has not yet given their consent to your [configured consent information text](consent_settings). They will be reminded the next time they log in.
+    contact_mail_instructions: Define the mail address that users can reach a data controller to perform data change or removal requests.
+    contact_your_administrator: Please contact your administrator if you want to have your account deleted.
+    contact_this_mail_address: Please contact %{mail_address} if you want to have your account deleted.
+    text_update_consent_time: Check this box to force users to consent again. Enable when you have changed the legal aspect of the consent information above.
+    update_consent_last_time: 'Last update of consent: %{update_time}'
+  copy_project:
+    title: Copy project "%{source_project_name}"
+    started: Started to copy project "%{source_project_name}" to "%{target_project_name}". You will be informed by mail as soon as "%{target_project_name}" is available.
+    failed: Cannot copy project %{source_project_name}
+    failed_internal: Copying failed due to an internal error.
+    succeeded: Created project %{target_project_name}
+    errors: Error
+    project_custom_fields: Custom fields on project
+    x_objects_of_this_type:
+      zero: No objects of this type
+      one: One object of this type
+      other: "%{count} objects of this type"
+    text:
+      failed: Could not copy project "%{source_project_name}" to project "%{target_project_name}".
+      succeeded: Copied project "%{source_project_name}" to "%{target_project_name}".
+    source_project_label: Project copied
+    copy_options:
+      dependencies_label: Copy from project
+  create_project:
+    attributes_heading: Fill in this mandatory information to work on your projects.
+    template_label: Use template
+    template_heading: Select a project template to work with the most common project management methods, or create a project from scratch.
+    copy_options:
+      dependencies_label: Copy from template
+    blank_template:
+      label: Blank project
+      description: Start from scratch. Manually add project attributes, members and modules.
+    blank_description: No description provided.
+  create_portfolio:
+    template_heading: Select a portfolio template to work with the most common project management methods, or create a portfolio from scratch.
+    blank_template:
+      label: Blank portfolio
+      description: Start from scratch. Manually add portfolio attributes, members and modules.
+  create_program:
+    template_heading: Select a program template to work with the most common project management methods, or create a program from scratch.
+    blank_template:
+      label: Blank program
+      description: Start from scratch. Manually add program attributes, members and modules.
+  create_wiki_page: Create new wiki page
+  create_wiki_page_button: Wiki page
+  date:
+    abbr_day_names:
+    - Sun
+    - Mon
+    - Tue
+    - Wed
+    - Thu
+    - Fri
+    - Sat
+    abbr_month_names:
+    -
+    - Jan
+    - Feb
+    - Mar
+    - Apr
+    - May
+    - Jun
+    - Jul
+    - Aug
+    - Sep
+    - Oct
+    - Nov
+    - Dec
+    abbr_week: Wk
+    day_names:
+    - Sunday
+    - Monday
+    - Tuesday
+    - Wednesday
+    - Thursday
+    - Friday
+    - Saturday
+    formats:
+      default: "%m/%d/%Y"
+      long: "%B %d, %Y"
+      short: "%b %d"
+    month_names:
+    -
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December
+    order:
+    - :year
+    - :month
+    - :day
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_days:
+        one: 1 day
+        other: "%{count} days"
+      x_minutes:
+        one: 1 minute
+        other: "%{count} minutes"
+      x_minutes_abbreviated:
+        one: 1 min
+        other: "%{count} mins"
+      x_hours:
+        one: 1 hour
+        other: "%{count} hours"
+      x_hours_abbreviated:
+        one: 1 hr
+        other: "%{count} hrs"
+      x_weeks:
+        one: 1 week
+        other: "%{count} weeks"
+      x_months:
+        one: 1 month
+        other: "%{count} months"
+      x_years:
+        one: 1 year
+        other: "%{count} years"
+      x_seconds:
+        one: 1 second
+        other: "%{count} seconds"
+      x_seconds_abbreviated:
+        one: 1 s
+        other: "%{count} s"
+    units:
+      minute_abbreviated:
+        one: min
+        other: mins
+      hour:
+        one: hour
+        other: hours
+      day:
+        one: day
+        other: days
+  description_active: Active?
+  description_attachment_toggle: Show/Hide attachments
+  description_autocomplete: 'This field uses autocomplete. While typing the title of a work package you will receive a list of possible candidates. Choose one using the arrow up and arrow down key and select it with tab or enter. Alternatively you can enter the work package number directly.
+
+    '
+  description_available_columns: Available Columns
+  description_choose_project: Projects
+  description_compare_from: Compare from
+  description_compare_to: Compare to
+  description_current_position: 'You are here: '
+  description_date_from: Enter start date
+  description_date_to: Enter end date
+  description_enter_number: Enter number
+  description_enter_text: Enter text
+  description_filter: Filter
+  description_filter_toggle: Show/Hide filter
+  description_category_reassign: Choose category
+  description_message_content: Message content
+  description_my_project: You are member
+  description_notes: Notes
+  description_parent_work_package: Parent work package of current
+  description_project_scope: Search scope
+  description_query_sort_criteria_attribute: Sort attribute
+  description_query_sort_criteria_direction: Sort direction
+  description_search: Searchfield
+  description_select_work_package: Select work package
+  description_selected_columns: Selected Columns
+  description_sub_work_package: Sub work package of current
+  description_toc_toggle: Show/Hide table of contents
+  description_wiki_subpages_reassign: Choose new parent page
+  direction: ltr
+  ee:
+    features:
+      baseline_comparison: Baseline Comparisons
+      board_view: Advanced Boards
+      calculated_values: Calculated values
+      capture_external_links: Capture External Links
+      internal_comments: Internal Comments
+      custom_actions: Custom Actions
+      custom_field_hierarchies: Hierarchies
+      customize_life_cycle: Customize Life Cycle
+      date_alerts: Date Alerts
+      define_custom_style: Custom theme and logo
+      edit_attribute_groups: Edit Attribute Groups
+      gantt_pdf_export: Gantt PDF Export
+      ldap_groups: LDAP users and group sync
+      mcp_server: Model Context Protocol (MCP)
+      meeting_templates: Reusable meeting templates
+      nextcloud_sso: Single Sign-On for Nextcloud Storage
+      one_drive_sharepoint_file_storage: OneDrive/SharePoint File Storage
+      placeholder_users: Placeholder Users
+      portfolio_management: Portfolio management
+      project_creation_wizard: Project initiation request
+      project_list_sharing: Project List Sharing
+      readonly_work_packages: Readonly Work Packages
+      scim_api: SCIM server API
+      sso_auth_providers: Single Sign-On
+      team_planner_view: Team Planner View
+      virus_scanning: Antivirus Scanning
+      weighted_item_lists: Weighted item lists
+      work_package_query_relation_columns: Work Package Query Relation Columns
+      work_package_sharing: Share work packages with external users
+      work_package_subject_generation: Work Package Subject Generation
+    upsell:
+      buy_now_button: Buy now
+      plans_title: Enterprise plans
+      title: Enterprise add-on
+      plan_title: Enterprise %{plan} add-on
+      plan_name: "%{plan} enterprise plan"
+      trial_text: This feature is included in your active Enterprise trial.
+      plan_text_html: Available starting with the %{plan_name}.
+      unlimited: Unlimited
+      already_have_token: 'Already have a token? Add it using the button below to upgrade to the booked Enterprise plan.
+
+        '
+      hide_banner: Hide this banner
+      homescreen_description: 'Enterprise plans extend the Community edition of OpenProject with additional [Enterprise add-ons](enterprise_url) and professional support, ideal for organizations running OpenProject in a mission-critical environment.
+
+        '
+      homescreen_subline: By upgrading, you will also be supporting an open source project.
+      baseline_comparison:
+        description: Highlight changes made to this list since any point in the past.
+      benefits:
+        description: What are the benefits of the Enterprise on-premises edition?
+        high_security: Security features
+        high_security_text: Single sign on (SAML, OpenID Connect, CAS), LDAP groups.
+        installation: Installation support
+        installation_text: Experienced software engineers guide you through the complete installation and setup process in your own infrastructure.
+        premium_features: Enterprise add-ons
+        premium_features_text: Agile boards, custom theme and logo, graphs, intelligent workflows with custom actions, full text search for work package attachments and multi-select custom fields.
+        professional_support: Professional support
+        professional_support_text: Get reliable, high-touch support from senior support engineers with expert knowledge about running OpenProject in business-critical environments.
+      work_package_subject_generation:
+        description: Create automatically generated subjects using referenced attributes and text.
+      customize_life_cycle:
+        description: Create and organize different project phases than the ones provided by PM2 project cycle planning.
+      capture_external_links:
+        description: Prevent social engineering attacks by capturing and warning about external links before users visit them.
+      work_package_query_relation_columns:
+        description: Need to see relations or child elements in the work package list?
+      edit_attribute_groups:
+        description: 'Customize form configuration with these additional add-ons:'
+        features:
+          groups: Add new attribute groups
+          rename: Rename attribute groups
+          related: Add a table of related work packages
+      readonly_work_packages:
+        description: Mark work packages as read-only for specific statuses.
+      custom_field_hierarchies:
+        description: Hierarchy custom fields allow organizing hierarchical structures in work packages and projects by making use of multi-level select lists.
+      date_alerts:
+        description: With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline.
+      weighted_item_lists:
+        description: Weighted item lists allow you to create a list with underlying numeric values associated.
+      work_package_sharing:
+        description: Share work packages with users who are not members of the project.
+      project_list_sharing:
+        description: Share project lists with individual users.
+      calculated_values:
+        description: Calculated values allow you to create a mathematical formula based attribute using numeric values and other project attributes and custom fields.
+      define_custom_style:
+        title: Custom color theme and logo
+        more_info: 'Note: the used logo will be publicly accessible.'
+        description: Customize your OpenProject installation with your own logo and colors.
+      custom_actions:
+        title: Custom actions
+        description: Custom actions are one-click shortcuts to a set of pre-defined actions that you can make available on certain work packages based on status, role, type or project.
+      mcp_server:
+        description: Bring OpenProject into your AI workflows with a secure MCP server.
+      meeting_templates:
+        description: Define meeting templates with a set agenda structure and save time by reusing them when creating new meetings.
+      nextcloud_sso:
+        title: Single Sign-On for Nextcloud Storage
+        description: Enable seamless and secure authentication for your Nextcloud storage with Single Sign-On. Simplify access management and enhance user convenience.
+      scim_api:
+        title: SCIM clients
+        description: Automate user management in OpenProject by seamlessly integrating external identity services like Microsoft Entra or Keycloak through our SCIM Server API. Available starting with the Enterprise corporate plan.
+      sso_auth_providers:
+        title: Single Sign-On (SSO)
+        description: Enable users to log in via external SSO providers using SAML or OpenID Connect for seamless access and integration with existing identity systems.
+      virus_scanning:
+        description: Ensure uploaded files in OpenProject are scanned for viruses before being accessible by other users.
+      project_creation_wizard:
+        description: Generate a step-by-step wizard to help project managers fill out a project initiation request.
+      placeholder_users:
+        title: Placeholder users
+        description: 'Placeholder users are a way to assign work packages to users who are not part of your project. They can be useful in a range of scenarios; for example, if you need to track tasks for a resource that is not yet named or available, or if you don’t want to give that person access to OpenProject but still want to track tasks assigned to them.
+
+          '
+      internal_comments:
+        title: Internal comments
+        description: Internal comments allow an internal team to communicate amongst themselves privately. These are only visible to certain project roles and will never be visible publicly.
+      internal_comments_inline:
+        title: Write internal comments only a small group can see
+        description: " "
+      portfolio_management:
+        description: Align your projects to your strategic goals by organizing them into portfolios and programs.
+    teaser:
+      title:
+        one: One day left of %{trial_plan} trial token
+        other: "%{count} days left of %{trial_plan} trial token"
+      description_html: You have access to all %{trial_plan} features.
+    trial:
+      not_found: You have requested a trial token, but that request is no longer available. Please try again.
+      wait_for_confirmation: We sent you an email to confirm your address in order to retrieve a trial token.
+      already_retrieved: 'Your trial enterprise token was already retrieved. Please check your emails for the token being attached. Please reach out to our support team if you need a new one.
+
+        '
+      successfully_saved: Your trial enterprise token has been successfully retrieved.
+      token_sent: Trial token requested
+      request_again: Request again
+      resend_action: Resend confirmation email
+      welcome_title: Quick feature overview
+      welcome_description: Get a quick overview of project management and team collaboration with OpenProject Enterprise edition.
+      confirmation_info: 'We sent you an email on %{date} to %{email} with all the information to start the free trial of OpenProject Enterprise. Please check your inbox and click the confirmation link provided to start your 14-day free trial.
+
+        '
+      confirmation_subline: 'Please, check your inbox and follow the steps to start your 14-day free trial.
+
+        '
+      domain_caption: The token will be valid for your currently configured host name.
+      receive_newsletter: I want to receive the OpenProject [newsletter](newsletter_url).
+      consent: I agree with the [terms of service](tos_url) and the [privacy policy](privacy_url).
+  email_calendar_updates:
+    state:
+      disabled: Disabled.
+      enabled: Enabled.
+    button:
+      disabled: Enable
+      enabled: Disable
+  enumeration_activities: Time tracking activities
+  enumeration_work_package_priorities: Work package priorities
+  enumeration_reported_project_statuses: Reported status
+  enumeration_caption_order_changed: Order successfully changed.
+  enumeration_could_not_be_moved: Enumeration could not be moved.
+  enterprise_trials:
+    dialog_component:
+      title: Enterprise Trial
+  error_auth_source_sso_failed: Single Sign-On (SSO) for user '%{value}' failed
+  error_can_not_archive_project: 'This project cannot be archived: %{errors}'
+  error_can_not_delete_entry: Unable to delete entry
+  error_can_not_delete_custom_field: Unable to delete custom field
+  error_can_not_delete_in_use_archived_undisclosed: There are also work packages in archived projects. You need to ask an administrator to perform the deletion to see which projects are affected.
+  error_can_not_delete_in_use_archived_work_packages: 'There are also work packages in archived projects. You need to reactivate the following projects first, before you can change the attribute of the respective work packages: %{archived_projects_urls}'
+  error_can_not_delete_type:
+    explanation: This type contains work packages and cannot be deleted. You can see all affected work packages in <a target="_blank" href="%{url}">this view</a>.
+  error_can_not_delete_standard_type: Standard types cannot be deleted.
+  error_can_not_invite_user: Failed to send invitation to user.
+  error_can_not_remove_role: This role is in use and cannot be deleted.
+  error_can_not_reopen_work_package_on_closed_version: A work package assigned to a closed version cannot be reopened
+  error_can_not_find_all_resources: Could not find all related resources to this request.
+  error_can_not_unarchive_project: 'This project cannot be unarchived: %{errors}'
+  error_check_user_and_role: Please choose a user and a role.
+  error_code: Error %{code}
+  error_color_could_not_be_saved: Color could not be saved
+  error_cookie_missing: The OpenProject cookie is missing. Please ensure that cookies are enabled, as this application will not properly function without.
+  error_custom_option_not_found: Option does not exist.
+  error_enterprise_plan_needed: You need the %{plan} enterprise plan to perform this action.
+  error_enterprise_activation_user_limit: Your account could not be activated (user limit reached). Please contact your administrator to gain access.
+  error_enterprise_token_invalid_domain: The Enterprise edition is not active. Your Enterprise token's domain (%{actual}) does not match the system's host name (%{expected}).
+  error_failed_to_delete_entry: Failed to delete this entry.
+  error_in_dependent: 'Error attempting to alter dependent object: %{dependent_class} #%{related_id} - %{related_subject}: %{error}'
+  error_in_new_dependent: 'Error attempting to create dependent object: %{dependent_class} - %{related_subject}: %{error}'
+  error_invalid_selected_value: Invalid selected value.
+  error_journal_attribute_not_present: Journal does not contain attribute %{attribute}.
+  error_pdf_export_too_many_columns: Too many columns selected for the PDF export. Please reduce the number of columns.
+  error_pdf_date_range_too_long: The selected work package date range exceeds the allowable PDF export limit. Please condense the range to a maximum of %{years} years.
+  error_pdf_failed_to_export: 'The PDF export could not be saved: %{error}'
+  error_token_authenticity: Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again.
+  error_reminder_not_found: The reminder was not found or was already notified about.
+  error_work_package_not_found_in_project: The work package was not found or does not belong to this project
+  error_work_package_id_not_found: The work package was not found.
+  error_must_be_project_member: must be project member
+  error_migrations_are_pending: Your OpenProject installation has pending database migrations. You have likely missed running the migrations on your last upgrade. Please check the upgrade guide to properly upgrade your installation.
+  error_migrations_visit_upgrade_guides: Please visit our upgrade guide documentation
+  error_no_default_work_package_status: No default work package status is defined. Please check your configuration (Go to "Administration -> Work package statuses").
+  error_no_type_in_project: No type is associated to this project. Please check the Project settings.
+  error_omniauth_registration_timed_out: The registration via an external authentication provider timed out. Please try again.
+  error_omniauth_invalid_auth: The authentication information returned from the identity provider was invalid. Please contact your administrator for further help.
+  error_password_change_failed: An error occurred when trying to change the password.
+  error_scm_command_failed: 'An error occurred when trying to access the repository: %{value}'
+  error_scm_not_found: The entry or revision was not found in the repository.
+  error_type_could_not_be_saved: Type could not be saved
+  error_unable_delete_status: The work package status cannot be deleted since it is used by at least one work package.
+  error_unable_delete_default_status: Unable to delete the default work package status. Please select another default work package status before deleting the current one.
+  error_unable_to_connect: Unable to connect (%{value})
+  error_unable_delete_wiki: Unable to delete the wiki page.
+  error_unable_update_wiki: Unable to update the wiki page.
+  error_workflow_copy_source: Please select a source type or role
+  error_workflow_copy_target: Please select target type(s) and role(s)
+  error_menu_item_not_created: Menu item could not be added
+  error_menu_item_not_saved: Menu item could not be saved
+  error_wiki_root_menu_item_conflict: 'Can''t rename "%{old_name}" to "%{new_name}" due to a conflict in the resulting menu item with the existing menu item "%{existing_caption}" (%{existing_identifier}).
+
+    '
+  error_external_authentication_failed_message: 'An error occurred during external authentication: %{message}'
+  error_attribute_not_highlightable: 'Attribute(s) not highlightable: %{attributes}'
+  events:
+    changeset: Changeset edited
+    message: Message edited
+    news: News
+    project_details: Project details edited
+    project: Project edited
+    projects: Project edited
+    reply: Replied
+    time_entry: Timelog edited
+    wiki_page: Wiki page edited
+    work_package_closed: Work Package closed
+    work_package_edit: Work Package edited
+    work_package_note: Work Package note added
+    title:
+      project_html: 'Project: %{name}'
+      subproject_html: 'Subproject: %{name}'
+  export:
+    dialog:
+      title: Export
+      submit: Export
+      save_export_settings:
+        label: Save settings
+      format:
+        label: File format
+        options:
+          csv:
+            label: CSV
+          pdf:
+            label: PDF
+          xls:
+            label: XLS
+      columns:
+        input_label_report: Add columns to attribute table
+        input_caption_report: By default all attributes added as columns in the work package list are selected. Long text fields are not available in the attribute table, but can be displayed below it.
+        input_caption_table: By default all attributes added as columns in the work package list are selected. Long text fields are not available in table based exports.
+        input_caption_required: It is not possible to export the view without any column. Please add at least one column.
+      pdf:
+        export_type:
+          label: PDF export type
+          options:
+            table:
+              label: Table
+              caption: Export the work packages list in a table with the desired columns.
+            report:
+              label: Report
+              caption: Export the work package on a detailed report of all work packages in the list.
+            gantt:
+              label: Gantt chart
+              caption: Export the work packages list in a Gantt diagram view.
+        include_images:
+          label: Include images
+          caption: Exclude images to reduce the size of the PDF export.
+        gantt_zoom_levels:
+          label: Zoom levels
+          caption: Select what is the zoom level for dates displayed in the chart.
+          options:
+            days: Days
+            weeks: Weeks
+            months: Months
+            quarters: Quarters
+        column_width:
+          label: Table column width
+          options:
+            narrow: Narrow
+            medium: Medium
+            wide: Wide
+            very_wide: Very wide
+        paper_size:
+          label: Paper size
+          caption: Depending on the chart size more than one page might be exported.
+        long_text_fields:
+          input_caption: By default all long text fields are selected.
+          input_label: Add long text fields
+          input_placeholder: Search for long text fields
+          drag_area_label: Manage long text fields
+      xls:
+        include_relations:
+          label: Include relations
+          caption: This option will create a duplicate of each work package for every relation this has with another work package.
+        include_descriptions:
+          label: Include descriptions
+          caption: This option will add a description column in raw format.
+    your_work_packages_export: Work packages are being exported
+    your_projects_export: Projects are being exported
+    succeeded: Export completed
+    failed: 'An error has occurred while trying to export the work packages: %{message}'
+    demo:
+      heading: Demo PDF
+      footer: Generated by OpenProject
+      button_text: Generate Demo PDF
+    errors:
+      embedded_table_with_too_many_columns: This embedded work package table could not fit on the page, please reduce the number of columns.
+    format:
+      atom: Atom
+      csv: CSV
+      pdf: PDF
+      pdf_overview_table: PDF Table
+      pdf_report_with_images: PDF Report with images
+      pdf_report: PDF Report
+      pdf_gantt: PDF Gantt
+    image:
+      omitted: Image not exported.
+    macro:
+      error: Macro error, %{message}
+      attribute_not_found: 'attribute not found: %{attribute}'
+      model_not_found: 'invalid attribute model: %{model}'
+      resource_not_found: 'resource not found: %{resource}'
+      nested_rich_text_unsupported: Nested rich text embedding currently not supported in export
+    units:
+      hours: h
+      days: d
+  pdf_generator:
+    page_nr_footer: Page %{page} of %{total}
+    template_attributes:
+      label: Attributes and description
+      caption: All the attributes present in the current form configuration using the default template.
+    template_contract:
+      label: Contract
+      caption: Work package details formatted to the standard German contract form.
+    dialog:
+      title: Generate PDF
+      submit: Download
+      templates:
+        label: Template
+        none_enabled: No template has been enabled for this work package type
+      footer_center:
+        label: Footer text
+        caption: This text will appear on every page at the center of the footer.
+      footer_right:
+        label: Footer text
+        caption: This text will appear on every page at the right of the footer.
+      hyphenation:
+        label: Hyphenation
+        caption: Break line between words for better layout and justification.
+      hyphenation_language:
+        label: Language and hyphenation
+      page_orientation:
+        label: Page orientation
+        caption: Select the orientation of the pages in the PDF document.
+        options:
+          portrait: Portrait
+          landscape: Landscape
+  extraction:
+    available:
+      pdftotext: Pdftotext available (optional)
+      unrtf: Unrtf available (optional)
+      catdoc: Catdoc available (optional)
+      xls2csv: Xls2csv available (optional)
+      catppt: Catppt available (optional)
+      tesseract: Tesseract available (optional)
+  filterable_tree_view:
+    filter_mode:
+      all: All
+      label: Filter mode
+      selected: Selected
+    include_sub_items: Include sub-items
+    no_results_text: No results
+  toggle_switch:
+    label_on: 'On'
+    label_off: 'Off'
+  general_csv_decimal_separator: "."
+  general_csv_encoding: UTF-8
+  general_csv_separator: ","
+  general_first_day_of_week: '7'
+  general_pdf_encoding: ISO-8859-1
+  general_text_no: 'no'
+  general_text_yes: 'yes'
+  general_text_No: 'No'
+  general_text_Yes: 'Yes'
+  general_text_true: 'true'
+  general_text_false: 'false'
+  gui_validation_error: 1 error
+  gui_validation_error_plural: "%{count} errors"
+  health_reports:
+    report_component:
+      checks:
+        failures:
+          one: "%{count} check failed"
+          other: "%{count} checks failed"
+        success: All checks passed
+        warnings:
+          one: "%{count} check returned a warning"
+          other: "%{count} checks returned a warning"
+      summary:
+        failure: Some checks failed and the system does not work as expected.
+        success: All connections and systems are working as expected.
+        warning: Some checks returned a warning. This can lead to unexpected behaviour.
+    result_component:
+      status:
+        failed: Failed
+        passed: Passed
+        skipped: Skipped
+        warning: Warning
+  homescreen:
+    additional:
+      projects: Newest visible projects in this instance.
+      no_visible_projects: There are no visible projects in this instance.
+      users: Newest registered users in this instance.
+    blocks:
+      community: OpenProject community
+      upsell:
+        title: Upgrade to Enterprise edition
+      new_features:
+        header: Read about new features and product updates.
+        learn_about: Learn more about all new features
+        missing: There are no highlighted features yet.
+        '17_4':
+          new_features_title: 'The release contains various new features and improvements, such as:
+
+            '
+          new_features_list:
+            line_0: Jira Migrator with support for basic custom fields.
+            line_1: Backlog buckets for structuring and prioritizing work packages during backlog refinement.
+            line_2: Easier drag and drop and improved move options in the Backlogs module.
+            line_3: Sprint Start and Complete buttons in the sprint header.
+            line_4: Copy workflow settings between roles.
+            line_5: "'My Meetings' widget on the Home and Project Overview pages."
+    links:
+      upgrade_enterprise_edition: Upgrade to Enterprise edition
+      postgres_migration: Migrating your installation to PostgreSQL
+      user_guides: User guides
+      faq: FAQ
+      impressum: Legal notice
+      glossary: Glossary
+      shortcuts: Shortcuts
+      blog: OpenProject blog
+      forums: Community forum
+      security_alerts: Security alerts
+      newsletter: Newsletter
+  image_conversion:
+    imagemagick: Imagemagick
+  journals:
+    changes_retracted: The changes were retracted.
+    caused_changes:
+      budget_deleted: Budget has been deleted
+      dates_changed: Dates changed
+      default_attribute_written: Read-only attributes written
+      import: Imported
+      progress_mode_changed_to_status_based: Progress calculation updated
+      status_changed: Status '%{status_name}'
+      system_update: 'OpenProject system update:'
+      work_package_duplicate_closed: 'Duplicate work package updated:'
+      total_percent_complete_mode_changed_to_work_weighted_average: Calculation of % Complete totals now weighted by Work.
+      total_percent_complete_mode_changed_to_simple_average: Calculation of % Complete totals now based on a simple average of only % Complete values.
+    cause_descriptions:
+      import:
+        header: changes by %{author}
+        field_changed: "%{field} changed from %{old_value} to %{new_value}"
+        field_set: "%{field} set to %{value}"
+        field_removed: "%{field} removed"
+        field_updated: "%{field} updated"
+        deleted_with_diff: "%{field} deleted (%{link})"
+        changed_with_diff: "%{field} changed (%{link})"
+        set_with_diff: "%{field} set (%{link})"
+      work_package_predecessor_changed_times: by changes to predecessor %{link}
+      work_package_parent_changed_times: by changes to parent %{link}
+      work_package_children_changed_times: by changes to child %{link}
+      work_package_related_changed_times: by changes to related %{link}
+      work_package_duplicate_closed: The status was automatically updated by the duplicated work package %{link}
+      unaccessable_work_package_changed: by changes to a related work package
+      budget_deleted: Budget has been deleted
+      working_days_changed:
+        changed: by changes to working days (%{changes})
+        days:
+          working: "%{day} is now working"
+          non_working: "%{day} is now non-working"
+        dates:
+          working: "%{date} is now working"
+          non_working: "%{date} is now non-working"
+      progress_mode_changed_to_status_based: Progress calculation mode set to status-based
+      status_excluded_from_totals_set_to_false_message: now included in hierarchy totals
+      status_excluded_from_totals_set_to_true_message: now excluded from hierarchy totals
+      status_percent_complete_changed: "% Complete changed from %{old_value}% to %{new_value}%"
+      system_update:
+        file_links_journal: 'From now on, activity related to file links (files stored in external storages) will appear here in the Activity tab. The following represent activity concerning links that already existed:
+
+          '
+        progress_calculation_adjusted_from_disabled_mode: Progress calculation automatically <a href="%{href}" target="_blank">set to work-based mode and adjusted with version update</a>.
+        progress_calculation_adjusted: Progress calculation automatically <a href="%{href}" target="_blank">adjusted with version update</a>.
+        scheduling_mode_adjusted: Scheduling mode automatically adjusted with version update.
+        totals_removed_from_childless_work_packages: Work and progress totals automatically removed for non-parent work packages with <a href="%{href}" target="_blank">version update</a>. This is a maintenance task and can be safely ignored.
+        sprint_migration: Version '%{version_name}' has been copied as a sprint.
+      total_percent_complete_mode_changed_to_work_weighted_average: Child work packages without Work are ignored.
+      total_percent_complete_mode_changed_to_simple_average: Work values of child work packages are ignored.
+  links:
+    configuration_guide: Configuration guide
+    get_in_touch: You have questions? Get in touch with us.
+  instructions_after_registration_link: You can sign in as soon as your account has been activated by clicking [here](signin_url).
+  instructions_after_logout_link: You can sign in again by clicking [here](signin_url).
+  instructions_after_error_link: You can try to sign in again by clicking [here](signin_url). If the error persists, ask your admin for help.
+  menus:
+    admin:
+      ai: Artificial Intelligence (AI)
+      aggregation: Aggregation
+      api_and_webhooks: API and webhooks
+      mail_notification: Email notifications
+      mails_and_notifications: Emails and notifications
+      mcp_configurations: Model Context Protocol (MCP)
+    quick_add:
+      label: Add…
+  my_account:
+    notifications_and_email:
+      title: Notification and email
+      tabs:
+        notifications: Notification settings
+        email_reminders: Email reminders
+    access_tokens:
+      description: Provider tokens are issued by OpenProject, allowing other applications to access it. Client tokens are issued by other applications, allowing OpenProject to access them.
+      no_results:
+        title: No access tokens to display
+        description: All of them have been disabled. They can be re-enabled in the administration menu.
+      access_tokens: Access tokens
+      headers:
+        action: Action
+        expiration: Expires
+      indefinite_expiration: Never
+      simple_revoke_confirmation: Are you sure you want to revoke this token?
+      tabs:
+        client:
+          title: Client tokens
+        provider:
+          title: Provider tokens
+      token/api:
+        blank_description: There is no API token yet. You can create one using the button below.
+        blank_title: No API token
+        title: API
+        table_title: API tokens
+        text_hint: API tokens allow third-party applications to communicate with this OpenProject instance via REST APIs.
+        static_token_name: API token
+        disabled_text: API tokens are not enabled by the administrator. Please contact your administrator to use this feature.
+        add_button: API token
+      ical:
+        blank_description: To add an iCalendar token, subscribe to a new or existing calendar from within the Calendar module of a project. You must have the necessary permissions.
+        blank_title: No iCalendar token
+        title: iCalendar
+        table_title: iCalendar tokens
+        text_hint_link: iCalendar tokens allow users to [subscribe to OpenProject calendars](docs_url) and view up-to-date work package information from external clients.
+        disabled_text: iCalendar subscriptions are not enabled by the administrator. Please contact your administrator to use this feature.
+      oauth_application:
+        active_tokens: Active tokens
+        blank_description: There is no third-party application access configured and active for you.
+        blank_title: No OAuth application token
+        last_refreshed_at: Last refreshed at
+        title: OAuth
+        table_title: OAuth application tokens
+        text_hint: OAuth application tokens allow third-party applications to connect with this OpenProject instance.
+      oauth_client:
+        blank_description: There are no OAuth client tokens yet.
+        blank_title: No OAuth client tokens
+        failed: An error occurred and the token couldn't be removed. Please try again later.
+        integration_type: Integration type
+        table_title: OAuth client tokens
+        text_hint: OAuth client tokens allow this OpenProject instance to connect with external applications, such as file storages.
+        title: OAuth
+        remove_token: Do you really want to remove this token? You will need to login again on %{integration}.
+        removed: OAuth client token successfully removed
+        unknown_integration: Unknown
+      token/rss:
+        add_button: RSS token
+        blank_description: There is no RSS token yet. You can create one using the button below.
+        blank_title: No RSS token
+        title: RSS
+        table_title: RSS tokens
+        text_hint: RSS tokens allow users to keep up with the latest changes in this OpenProject instance via an external RSS reader.
+        static_token_name: RSS token
+        disabled_text: RSS tokens are not enabled by the administrator. Please contact your administrator to use this feature.
+      storages:
+        unknown_storage: Unknown storage
+    email_reminders:
+      immediate_reminders:
+        title: Send me an email reminder
+        mentioned: Notify me when I am mentioned
+        personal_reminder: Notify me for personal reminders
+      daily_reminders:
+        title: Send me daily email reminders for unread notifications
+        description: You will receive these reminders only for unread notifications and only at hours you specify. Until you configure a time zone for your account, the times will be interpreted to be in UTC.
+        enabled: Enable daily email reminders
+        add_time: Add time
+        remove_time: Remove time
+        time_slot_label: Reminder time (UTC)
+      workdays:
+        title: Receive email reminders on these days
+        submit_button: Update reminder days
+      pause_reminders:
+        title: Pause email notifications
+        enabled: Temporarily pause daily email reminders
+        date_range: Pause period
+      email_alerts:
+        title: Email alerts for other items that are not work packages
+        description: Notifications today are limited to work packages. You can choose to continue receiving email alerts for these events until they are included in notifications.
+        news_added: News added
+        news_commented: Comment on a news item
+        document_added: Document added
+        forum_messages: Forum message posted
+        wiki_page_added: Wiki page added
+        wiki_page_updated: Wiki page updated
+        membership_added: Membership added
+        membership_updated: Membership updated
+        submit_button: Update alerts
+    notifications:
+      participating:
+        title: Participating
+        description: Notifications for all activities in work packages you are involved in (assignee, accountable or watcher).
+        submit_button: Update preferences
+        mentioned: Mentioned
+        watched: Watching
+        assignee: Assignee
+        responsible: Accountable
+        shared: Shared with me
+      date_alerts:
+        title: Date alerts
+        description: Automatic notifications when important dates are approaching for open work packages you are involved in (assignee, accountable or watcher).
+        submit_button: Update date alerts
+        start_date: Start date
+        due_date: Finish date
+        overdue: Overdue
+        times:
+          same_day: On the same day
+          one_day_before: 1 day before
+          three_days_before: 3 days before
+          seven_days_before: 7 days before
+          one_day_after: 1 day after
+          three_days_after: 3 days after
+          seven_days_after: 7 days after
+      non_participating:
+        title: Non-participating
+        description: Additional notifications for activities in all projects.
+        submit_button: Update preferences
+        work_package_created: New work packages
+        work_package_commented: All new comments
+        work_package_processed: All status changes
+        work_package_prioritized: All priority changes
+        work_package_scheduled: All date changes
+      project_specific_settings:
+        title: Project-specific notification settings
+        description: These project-specific settings override default settings above.
+        add_button: Add project-specific notifications
+        dialog_title: Add project-specific notifications
+        list_header: Projects with specific notifications
+  notifications:
+    reasons:
+      assigned: Assignee
+      dateAlert: Date alert
+      mentioned: Mentioned
+      responsible: Accountable
+      shared: Shared
+      watched: Watcher
+      reminder: Reminder
+    facets:
+      unread: Unread
+      unread_title: Show unread
+      all: All
+      all_title: Show all
+    menu:
+      by_project: Unread by project
+      by_reason: Reason
+      inbox: Inbox
+    send_notifications: Send notifications for this action
+    work_packages:
+      subject:
+        created: The work package was created.
+        assigned: You have been assigned to %{work_package}
+        subscribed: You subscribed to %{work_package}
+        mentioned: You have been mentioned in %{work_package}
+        responsible: You have become accountable for %{work_package}
+        watched: You are watching %{work_package}
+    query:
+      invalid_filter: Invalid notification filter
+  label_accessibility: Accessibility
+  label_account: Account
+  label_actions: Actions
+  label_active: Active
+  label_activate_user: Activate user
+  label_active_in_new_projects: Active in new projects
+  label_activity: Activity
+  label_add_edit_translations: Add and edit translations
+  label_add_another_file: Add another file
+  label_add_columns: Add selected columns
+  label_add_note: Add a note
+  label_add_projects: Add projects
+  label_add_related_work_packages: Add related work packages
+  label_add_subtask: Add subtask
+  label_added: added
+  label_added_by: Added by %{author}
+  label_added_by_on: Added by %{author} on %{date}
+  label_added_time_by: Added by %{author} %{age} ago
+  label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+  label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+  label_administration: Administration
+  label_interface_colors: Interface colors
+  label_interface_colors_description: 'These colors control how the application looks. If you modify them the theme will automatically be changed to Custom theme, but we can’t assure the compliance of the accessibility contrast minimums (WCAG 2.1). '
+  label_age: Age
+  label_ago: days ago
+  label_all: all
+  label_all_uppercase: All
+  label_all_time: all time
+  label_all_words: All words
+  label_all_open_wps: All open
+  label_always_visible: Always displayed
+  label_announcement: Announcement
+  label_angular: AngularJS
+  label_app_modules: "%{app_title} modules"
+  label_api_access_key: API access key
+  label_api_access_key_created_on: API access key created %{value} ago
+  label_api_access_key_type: API
+  label_auto_option: "(auto)"
+  label_ical_access_key_type: iCalendar
+  label_ical_access_key_description: iCalendar token "%{token_name}" for "%{calendar_name}" in "%{project_name}"
+  label_ical_access_key_not_present: iCalendar token(s) not present.
+  label_ical_access_key_generation_hint: Automatically generated when subscribing to a calendar.
+  label_ical_access_key_latest: latest
+  label_ical_access_key_revoke: Revoke
+  label_integrations: Integrations
+  label_add_column: Add column
+  label_applied_status: Applied status
+  label_archive_project: Archive project
+  label_ascending: Ascending
+  label_assigned_to_me_work_packages: Work packages assigned to me
+  label_associated_revisions: Associated revisions
+  label_attachment_plural: Attachments
+  label_attribute: Attribute
+  label_attribute_plural: Attributes
+  label_ldap_auth_source_new: New LDAP connection
+  label_ldap_auth_source: LDAP connection
+  label_ldap_auth_source_plural: LDAP connections
+  label_attribute_expand_text: The complete text for '%{attribute}'
+  label_authentication: Authentication
+  label_available_custom_fields_projects: Available custom fields projects
+  label_available_global_roles: Available global roles
+  label_available_project_attributes: Available project attributes
+  label_available_project_forums: Available forums
+  label_available_project_repositories: Available repositories
+  label_available_project_versions: Available versions
+  label_available_project_work_package_categories: Available work package categories
+  label_available_project_work_package_types: Available work package types
+  label_available_projects: Available projects
+  label_api_doc: API documentation
+  label_backup: Backup
+  label_backup_code: Backup code
+  label_basic_details: Basic details
+  label_between: between
+  label_blocked_by: blocked by
+  label_blocks: blocks
+  label_blog: Blog
+  label_forums_locked: Locked
+  label_forum_new: New forum
+  label_forum_plural: Forums
+  label_forum_sticky: Sticky
+  label_boolean: Boolean
+  label_board_plural: Boards
+  label_branch: Branch
+  label_browse: Browse
+  label_builtin: Built-in
+  label_bulk_edit_selected_work_packages: Bulk edit selected work packages
+  label_bundled: "(Bundled)"
+  label_calendar: Calendar
+  label_calendars_and_dates: Calendars and dates
+  label_calendar_show: Show Calendar
+  label_category: Category
+  label_completed: Completed
+  label_committed_at_html: "%{committed_revision_link} at %{date}"
+  label_committed_link: committed revision %{revision_identifier}
+  label_consent_settings: User Consent
+  label_wiki_menu_item: Wiki menu item
+  label_select_main_menu_item: Select new main menu item
+  label_required_disk_storage: Required disk storage
+  label_send_invitation: Send invitation
+  label_calculated_value: Calculated value
+  label_change_parent: Change parent
+  label_change_plural: Changes
+  label_change_properties: Change properties
+  label_change_status: Change status
+  label_change_status_of_user: 'Change status of #{username}'
+  label_change_view_all: View all changes
+  label_changes_details: Details of all changes
+  label_changeset: Changeset
+  label_changeset_id: Changeset ID
+  label_changeset_plural: Changesets
+  label_checked: checked
+  label_check_uncheck_all_in_column: Check/Uncheck all in column
+  label_check_uncheck_all_in_row: Check/Uncheck all in row
+  label_child_element: Child element
+  label_choices: Choices
+  label_close_versions: Close completed versions
+  label_closed_work_packages: closed
+  label_collapse: Collapse
+  label_collapsed_click_to_show: Collapsed. Click to show
+  label_configuration: configuration
+  label_comment_add: Add a comment
+  label_comment_added: Comment added
+  label_comment_delete: Delete comments
+  label_comment_plural: Comments
+  label_commits_per_author: Commits per author
+  label_commits_per_month: Commits per month
+  label_confirmation: Confirmation
+  label_contains: contains
+  label_starts_with: starts with
+  label_content: Content
+  label_color_plural: Colors
+  label_copied: copied
+  label_copy_same_as_target: Same as target
+  label_copy_source: Source
+  label_copy_target: Target
+  label_copy_workflow_from: Copy workflow from
+  label_copy_workflow_from_type: Copy to another type
+  label_copy_workflow_from_role: Copy to other roles
+  label_copy_project: Copy project
+  label_core_version: Core version
+  label_core_build: Core build
+  label_created_by: Created by %{user}
+  label_current_status: Current status
+  label_current_version: Current version
+  label_custom_field_add_no_type: Add this field to a work package type
+  label_custom_field_new: New custom field
+  label_custom_field_plural: Custom fields
+  label_custom_field_default_type: Empty type
+  label_custom_style: Design
+  label_custom_style_description: Choose how OpenProject looks to you with themes, select your default colors to use in the app and how exports look like.
+  label_dashboard: Dashboard
+  label_database_version: PostgreSQL version
+  label_date: Date
+  label_dates: Dates
+  label_date_and_time: Date and time
+  label_date_format: Date format
+  label_date_from: From
+  label_date_from_to: From %{start} to %{end}
+  label_date_to: To
+  label_day_plural: days
+  label_default: Default
+  label_delete_user: Delete user
+  label_delete_project: Delete project
+  label_delete: Delete
+  label_deleted: deleted
+  label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
+  label_deleted_custom_option: "(deleted option)"
+  label_empty_element: "(empty)"
+  label_go_back: Go back one menu level
+  label_go_forward: Open %{module} sub-menu
+  label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
+  label_descending: Descending
+  label_details: Details
+  label_defaults: Defaults
+  label_development_roadmap: Development roadmap
+  label_diff: diff
+  label_diff_inline: inline
+  label_diff_side_by_side: side by side
+  label_digital_accessibility: Digital accessibility (DE)
+  label_disabled: disabled
+  label_disabled_uppercase: Disabled
+  label_display: Display
+  label_display_per_page: 'Per page: %{value}'
+  label_display_used_statuses_only: Only display statuses that are used by this type
+  label_download: "%{count} Download"
+  label_download_plural: "%{count} Downloads"
+  label_downloads_abbr: D/L
+  label_duplicated_by: duplicated by
+  label_duplicate: duplicate
+  label_duplicates: duplicates
+  label_edit: Edit
+  label_edit_x: 'Edit: %{x}'
+  label_view_x: 'View: %{x}'
+  label_enable_multi_select: Toggle multiselect
+  label_enabled_project_custom_fields: Enabled custom fields
+  label_enabled_project_modules: Enabled modules
+  label_enabled_project_activities: Enabled time tracking activities
+  label_end_to_end: end to end
+  label_end_to_start: end to start
+  label_enumeration_new: New enumeration value
+  label_enumeration_value: Enumeration value
+  label_enumerations: Enumerations
+  label_enterprise: Enterprise
+  label_enterprise_active_users: "%{current}/%{limit} booked active users"
+  label_enterprise_edition: Enterprise edition
+  label_enterprise_support: Enterprise support
+  label_environment: Environment
+  label_estimates_and_progress: Estimates and progress
+  label_equals: is
+  label_equals_with_descendants: is any with descendants
+  label_everywhere: everywhere
+  label_example: Example
+  label_experimental: Experimental
+  label_i_am_member: I am member
+  label_ifc_viewer: Ifc Viewer
+  label_ifc_model_plural: Ifc Models
+  label_import: Import
+  label_export_to: 'Also available in:'
+  label_expand: Expand
+  label_expanded_click_to_collapse: Expanded. Click to collapse
+  label_f_hour: "%{value} hour"
+  label_f_hour_plural: "%{value} hours"
+  label_favorite: Favorite
+  label_feed_plural: Feeds
+  label_feeds_access_key: RSS access key
+  label_feeds_access_key_created_on: RSS access key created %{value} ago
+  label_feeds_access_key_type: RSS
+  label_file_plural: Files
+  label_filter: Filters
+  label_filter_add: Add filter
+  label_filter_by: Filter by
+  label_filter_any_name_attribute: Name attributes
+  label_filter_plural: Filters
+  label_filters_toggle: Show/hide filters
+  label_float: Float
+  label_folder: Folder
+  label_follows: follows
+  label_form_configuration: Form configuration
+  label_formula: Formula
+  label_gantt_chart: Gantt chart
+  label_gantt_chart_plural: Gantt charts
+  label_general: General
+  label_generate_key: Generate a key
+  label_global_modules: Global modules
+  label_global_roles: Global roles
+  label_git_path: Path to .git directory
+  label_greater_or_equal: ">="
+  label_group_by: Group by
+  label_group_new: New group
+  label_group: Group
+  label_group_named: Group %{name}
+  label_group_plural: Groups
+  label_help: Help
+  label_here: here
+  label_hide: Hide
+  label_history: History
+  label_hierarchy: Hierarchy
+  label_hierarchy_leaf: Hierarchy leaf
+  label_home: Home
+  label_subject_or_id: Subject or ID
+  label_calendar_subscriptions: Calendar subscriptions
+  label_identifier: Identifier
+  label_project_identifier: Project identifier
+  label_in: in
+  label_in_less_than: in less than
+  label_in_more_than: in more than
+  label_inactive: Inactive
+  label_incoming_emails: Incoming emails
+  label_includes: includes
+  label_incomplete: Incomplete
+  label_include_sub_projects: Include sub-projects
+  label_index_by_date: Index by date
+  label_index_by_title: Index by title
+  label_information: Information
+  label_information_plural: Information
+  label_installation_guides: Installation guides
+  label_integer: Integer
+  label_interface: Interface
+  label_internal: Internal
+  label_introduction_video: Getting started video
+  label_invite_user: Invite user
+  label_item: Item
+  label_item_plural: Items
+  label_weighted_item_list: Weighted item list
+  label_share: Share
+  label_share_project_list: Share project list
+  label_share_work_package: Share work package
+  label_show_all_registered_users: Show all registered users
+  label_show_less: Show less
+  label_show_more: Show more
+  label_journal: Journal
+  label_journal_diff: Description Comparison
+  label_language: Language
+  label_languages: Languages
+  label_external_links: External links
+  label_locale: Language and region
+  label_jump_to_a_project: Jump to a project...
+  label_jira_import: Jira Migrator
+  label_keyword_plural: Keywords
+  label_language_based: Based on user's language
+  label_last_activity: Last activity
+  label_last_change_on: Last change on
+  label_last_changes: last %{count} changes
+  label_last_login: Last login
+  label_last_month: last month
+  label_last_n_days: last %{count} days
+  label_last_week: last week
+  label_latest_revision: Latest revision
+  label_latest_revision_plural: Latest revisions
+  label_ldap_authentication: LDAP authentication
+  label_learn_more: Learn more
+  label_less_or_equal: "<="
+  label_less_than_ago: less than days ago
+  label_link_url: Link (URL)
+  label_list: List
+  label_loading: Loading...
+  label_locked: locked
+  label_lock_user: Lock user
+  label_logged_as: Logged in as
+  label_login: Sign in
+  label_custom_comment: "%{name} comment"
+  label_custom_logo: Custom logo desktop
+  label_custom_logo_mobile: Custom logo mobile
+  label_custom_export_logo: Custom export logo
+  label_custom_export_cover: Custom export cover background
+  label_custom_export_footer: Custom export footer image
+  label_custom_export_font_regular: Regular
+  label_custom_export_font_bold: Bold
+  label_custom_export_font_italic: Italic
+  label_custom_export_font_bold_italic: Bold Italic
+  label_custom_export_cover_overlay: Custom export cover background overlay
+  label_custom_export_cover_text_color: Text color
+  label_custom_pdf_export_settings: Custom PDF export settings
+  label_custom_favicon: Custom favicon
+  label_custom_touch_icon: Custom touch icon
+  label_departments: Organization
+  label_departments_description_html: 'Define your company’s structure by creating departments and sub-departments in a hierarchical way. This allows you to reflect reporting lines and maintain a clear, structured overview of your organization within OpenProject. You can also import an existing organization structure through [LDAP group synchronisation](ldap_docs_article).
+
+    '
+  label_logout: Sign out
+  label_mapping_for: 'Mapping for: %{attribute}'
+  label_main_menu: Side Menu
+  label_manage: Manage
+  label_manage_groups: Manage groups
+  label_managed_repositories_vendor: Managed %{vendor} repositories
+  label_mathematical_operators: Mathematical operators
+  label_max_size: Maximum size
+  label_me: me
+  label_member_new: New member
+  label_member_all_admin: "(All roles due to admin status)"
+  label_member_plural: Members
+  label_membership_plural: Memberships
+  label_membership_added: Member added
+  label_membership_updated: Member updated
+  label_menu: Menu
+  label_menu_badge:
+    pre_alpha: pre-alpha
+    alpha: alpha
+    beta: beta
+  label_menu_item_name: Name of menu item
+  label_message: Message
+  label_message_last: Last message
+  label_message_new: New message
+  label_message_plural: Messages
+  label_message_posted: Message added
+  label_min_max_length: Min - Max length
+  label_minute_plural: minutes
+  label_missing_api_access_key: Missing API access key
+  label_missing_feeds_access_key: Missing RSS access key
+  label_modification: "%{count} change"
+  label_modified: modified
+  label_module_plural: Modules
+  label_modules: Modules
+  label_months_from: months from
+  label_more: More
+  label_more_information: More information
+  label_more_than_ago: more than days ago
+  label_move_column_left: Move column left
+  label_move_column_right: Move column right
+  label_move_work_package: Move work package
+  label_my_account: Account settings
+  label_my_activity: My activity
+  label_my_account_data: My account data
+  label_my_avatar: My avatar
+  label_my_queries: My custom queries
+  label_name: Name
+  label_never: Never
+  label_new: New
+  label_new_features: New features
+  label_new_statuses_allowed: New statuses allowed
+  label_news_singular: News
+  label_news_added: News added
+  label_news_comment_added: Comment added to a news
+  label_news_latest: Latest news
+  label_news_new: Add news
+  label_news_edit: Edit news
+  label_news_plural: News
+  label_news_view_all: View all news
+  label_next: Next
+  label_next_week: Next week
+  label_next_year: Next year
+  label_no_change_option: "(No change)"
+  label_no_data: No data to display
+  label_no_due_date: no finish date
+  label_no_start_date: no start date
+  label_no_parent_page: No parent page
+  label_no_parent_group: "(No parent group)"
+  label_notification_center_plural: Notifications
+  label_nothing_display: Nothing to display
+  label_nobody: nobody
+  label_not_configured: Not configured
+  label_not_found: not found
+  label_none: none
+  label_none_parentheses: "(none)"
+  label_not_contains: doesn't contain
+  label_not_equals: is not
+  label_life_cycle_step_plural: Project life cycle
+  label_on: 'on'
+  label_operator_all: is not empty
+  label_operator_none: is empty
+  label_operator_equals_or: is (OR)
+  label_operator_equals_all: is (AND)
+  label_operator_shared_with_user_any: any
+  label_open: open
+  label_closed: closed
+  label_open_menu: Open menu
+  label_open_work_packages: open
+  label_open_work_packages_plural: open
+  label_openproject_website: OpenProject website
+  label_optional_description: Description
+  label_options: Options
+  label_other: Other
+  label_overall_activity: Overall activity
+  label_overview: Overview
+  label_page_title: Page title
+  label_parent_group_caption: 'Setting a parent group will make this group a subgroup of the selected parent group. This will also inherit all memberships, including permissions of the parent group.
+
+    '
+  label_part_of: part of
+  label_password_lost: Forgot your password?
+  label_password_rule_lowercase: Lowercase
+  label_password_rule_numeric: Numeric Characters
+  label_password_rule_special: Special Characters
+  label_password_rule_uppercase: Uppercase
+  label_password_requirement_lowercase: Must contain at least one lowercase character.
+  label_password_requirement_numeric: Must contain at least one numeric character.
+  label_password_requirement_special: Must contain at least one special character.
+  label_password_requirement_uppercase: Must contain at least one uppercase character.
+  label_path_encoding: Path encoding
+  label_per_page: 'Per page:'
+  label_people: People
+  label_permissions: Permissions
+  label_permissions_report: Permissions report
+  label_personalize_page: Personalize this page
+  label_placeholder_user: Placeholder user
+  label_placeholder_user_new: New placeholder user
+  label_placeholder_user_plural: Placeholder users
+  label_planning: Planning
+  label_please_login: Please log in
+  label_plugins: Plugins
+  label_portfolio_plural: Portfolios
+  label_modules_and_plugins: Modules and Plugins
+  label_precedes: precedes
+  label_preferences: Preferences
+  label_preview: Preview
+  label_preview_not_available: Preview not available
+  label_previous: Previous
+  label_previous_week: Previous week
+  label_previous_year: Previous year
+  label_principal_invite_via_email: " or invite new users via email"
+  label_principal_search: Add existing users or groups
+  label_privacy_policy: Data privacy and security policy
+  label_product_version: Product version
+  label_profile: Profile
+  label_percent_complete: "% Complete"
+  label_progress_tracking: Progress tracking
+  label_project: Project
+  label_project_activity: Project activity
+  label_project_attribute_plural: Project attributes
+  label_project_attribute_manage_link: Manage project attributes
+  label_project_count: Total number of projects
+  label_project_copy_notifications: Send email notifications during the project copy
+  label_project_initiation_export_pdf: Export PDF for %{project_creation_name}
+  label_project_latest: Latest projects
+  label_project_default_type: Allow empty type
+  label_project_hierarchy: Project hierarchy
+  label_project_mappings: Projects
+  label_project_new: New project
+  label_project_plural: Projects
+  label_project_list_plural: Project lists
+  label_project_life_cycle: Project life cycle
+  label_project_attributes_plural: Project attributes
+  label_project_custom_field_plural: Project attributes
+  label_project_settings: Project settings
+  label_project_attributes_settings: Project attributes settings
+  label_project_storage_plural: File storages
+  label_project_storage_project_folder: 'File storages: Project folders'
+  label_projects_disk_usage_information: "%{count} projects using %{used_disk_space} disk space"
+  label_project_view_all: View all projects
+  label_project_show_details: Show project details
+  label_project_hide_details: Hide project details
+  label_portfolio: Portfolio
+  label_portfolio_new: New portfolio
+  label_program: Program
+  label_program_new: New program
+  label_public_projects: Public projects
+  label_query_new: New query
+  label_query_plural: Custom queries
+  label_read: Read...
+  label_read_documentation: Read documentation
+  label_register: Create a new account
+  label_register_with_developer: Register as developer
+  label_registered_on: Registered on
+  label_related_work_packages: Related work packages
+  label_relates: related to
+  label_relates_to: related to
+  label_relation: Relation
+  label_relation_actions: Relation actions
+  label_relation_delete: Delete relation
+  label_relation_edit: Edit relation
+  label_relation_new: New relation
+  label_release_notes: Release notes
+  label_remaining_work: Remaining work
+  label_remove_column: Remove column
+  label_remove_columns: Remove selected columns
+  label_renamed: renamed
+  label_reply_plural: Replies
+  label_report: Report
+  label_report_bug: Report a bug
+  label_report_plural: Reports
+  label_reported_work_packages: Reported work packages
+  label_reporting: Reporting
+  label_reporting_plural: Reportings
+  label_repository: Repository
+  label_repository_remove: Remove repository
+  label_repository_root: Repository root
+  label_repository_plural: Repositories
+  label_request_submission: Request submission
+  label_required: required
+  label_requires: requires
+  label_result_plural: Results
+  label_revision: Revision
+  label_revision_id: Revision %{value}
+  label_revision_plural: Revisions
+  label_roadmap: Roadmap
+  label_roadmap_edit: Edit roadmap %{name}
+  label_roadmap_due_in: Due in %{value}
+  label_roadmap_no_work_packages: No work packages for this version
+  label_roadmap_overdue: "%{value} late"
+  label_role_and_permissions: Roles and permissions
+  label_role_new: New role
+  label_role_grantable: Grantable role
+  label_role_plural: Roles
+  label_role_missing_permissions: "%{role} (missing required permissions)"
+  label_role_search: Assign role to new members
+  label_scm: SCM
+  label_scroll_left: Scroll left
+  label_scroll_right: Scroll right
+  label_search: Search
+  label_search_by_name: Search by name
+  label_send_information: Send new credentials to the user
+  label_send_test_email: Send a test email
+  label_session: Session
+  label_setting_plural: Settings
+  label_system_settings: System settings
+  label_show_completed_versions: Show completed versions
+  label_columns: Columns
+  label_sort: Sort
+  label_sort_ascending: Sort ascending
+  label_sort_by: Sort by %{value}
+  label_sorted_by: sorted by %{value}
+  label_sort_descending: Sort descending
+  label_sort_higher: Move up
+  label_sort_highest: Move to top
+  label_sort_lower: Move down
+  label_sort_lowest: Move to bottom
+  label_spent_time: Spent time
+  label_start_to_end: start to end
+  label_start_to_start: start to start
+  label_statistics: Statistics
+  label_status: Status
+  label_status_plural: Statuses
+  label_storage_free_space: Remaining disk space
+  label_storage_used_space: Used disk space
+  label_storage_group: Storage filesystem %{identifier}
+  label_storage_for: Encompasses storage for
+  label_string: Text
+  label_subproject: Subproject
+  label_subproject_new: New subproject
+  label_subproject_plural: Subprojects
+  label_subitems: Subitems
+  label_subtask_plural: Subtasks
+  label_summary: Summary
+  label_system: System
+  label_system_storage: Storage information
+  label_table_of_contents: Table of contents
+  label_tag: Tag
+  label_team_planner: Team Planner
+  label_template: Template
+  label_templates: Templates
+  label_text: Long text
+  label_this_month: this month
+  label_this_week: this week
+  label_this_year: this year
+  label_time: Time
+  label_time_entry_plural: Spent time
+  label_time_entry_activity_plural: Spent time activities
+  label_title: Title
+  label_projects_menu: Projects
+  label_today: today
+  label_today_capitalized: Today
+  label_token_version: Token Version
+  label_today_as_start_date: Select today as start date.
+  label_today_as_due_date: Select today as finish date.
+  label_today_as_date: Select today as date.
+  label_top_menu: Top Menu
+  label_topic_plural: Topics
+  label_total: Total
+  label_type_new: New type
+  label_type_plural: Types
+  label_ui: User Interface
+  label_updated_time: Updated %{value} ago
+  label_updated_time_at: "%{author} %{age}"
+  label_updated_time_by: Updated by %{author} %{age} ago
+  label_upgrade_guides: Upgrade guides
+  label_used_by: Used by
+  label_used_by_types: Used by types
+  label_used_in_projects: Used in projects
+  label_user: User
+  label_user_and_permission: Users and permissions
+  label_user_named: User %{name}
+  label_user_activity_html: "%{value}'s activity"
+  label_user_anonymous: Anonymous
+  label_user_menu: User menu
+  label_user_new: New user
+  label_user_plural: Users
+  label_user_search: Search for user
+  label_user_settings: User settings
+  label_users_settings: Users settings
+  label_value_x: 'Value: %{x}'
+  label_version_new: New version
+  label_version_edit: Edit version
+  label_version_plural: Versions
+  label_version_sharing_descendants: With subprojects
+  label_version_sharing_hierarchy: With project hierarchy
+  label_version_sharing_none: Not shared
+  label_version_sharing_system: With all projects
+  label_version_sharing_tree: With project tree
+  label_videos: Videos
+  label_view_all_revisions: View all revisions
+  label_view_diff: View differences
+  label_view_revisions: View revisions
+  label_watched_work_packages: Watched work packages
+  label_what_is_this: What is this?
+  label_week: Week
+  label_widget: Widget
+  label_widget_new: New widget
+  label_wiki_content_added: Wiki page added
+  label_wiki_content_updated: Wiki page updated
+  label_wiki_toc: Table of Contents
+  label_wiki_toc_empty: Table of Contents is empty as no headings are present.
+  label_wiki_dont_show_menu_item: Do not show this wikipage in project navigation
+  label_wiki_edit: Wiki edit
+  label_wiki_edit_plural: Wiki edits
+  label_wiki_page_attachments: Wiki page attachments
+  label_wiki_page_id: Wiki page ID
+  label_wiki_navigation: Wiki navigation
+  label_wiki_page: Wiki page
+  label_wiki_page_plural: Wiki pages
+  label_wiki_show_index_page_link: Show submenu item 'Table of Contents'
+  label_wiki_show_menu_item: Show as menu item in project navigation
+  label_wiki_show_new_page_link: Show submenu item 'Create new child page'
+  label_wiki_start: Start page
+  label_work: Work
+  label_work_package: Work package
+  label_work_package_attachments: Work package attachments
+  label_work_package_category_new: New category
+  label_work_package_category_plural: Work package categories
+  label_work_package_comments: Work package comments
+  label_work_package_hierarchy: Work package hierarchy
+  label_work_package_new: New work package
+  label_work_package_edit: Edit work package %{name}
+  label_work_package_plural: Work packages
+  label_work_package_status: Work package status
+  label_work_package_status_new: New status
+  label_work_package_status_plural: Work package statuses
+  label_work_package_types: Work package types
+  label_work_package_tracking: Work package tracking
+  label_work_package_view_all: View all work packages
+  label_workflow: Workflow
+  label_workflow_copy: Copy workflow
+  label_workflow_plural: Workflows
+  label_workflow_summary: Summary
+  label_working_days_and_hours: Working days and hours
+  label_x_closed_work_packages_abbr:
+    one: 1 closed
+    other: "%{count} closed"
+    zero: 0 closed
+  label_x_comments:
+    one: 1 comment
+    other: "%{count} comments"
+    zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
+  label_x_open_work_packages_abbr:
+    one: 1 open
+    other: "%{count} open"
+    zero: 0 open
+  label_x_work_packages:
+    one: 1 work package
+    other: "%{count} work packages"
+    zero: No work packages
+  label_x_projects:
+    one: 1 project
+    other: "%{count} projects"
+    zero: no projects
+  label_x_files:
+    one: 1 file
+    other: "%{count} files"
+    zero: no files
+  label_x_days:
+    one: 1 day
+    other: "%{count} days"
+  label_x_working_days:
+    one: 1 working day
+    other: "%{count} working days"
+  label_x_working_days_time_off:
+    one: 'Time off: 1 working day'
+    other: 'Time off: %{count} working days'
+  label_yesterday: yesterday
+  label_zen_mode: Zen mode
+  label_role_type: Type
+  label_member_role: Project role
+  label_global_role: Global role
+  label_not_changeable: "(not changeable)"
+  label_global: Global
+  label_seeded_from_env_warning: This record has been created through a setting environment variable. It is not editable through UI.
+  label_schedule_and_availability: Schedule and availability
+  label_working_hours: Work schedule
+  label_non_working_days: Availability calendar
+  label_non_working_days_with_count: Non-working days (%{count})
+  label_non_working_days_summary: Summary
+  button_add_non_working_time: Time off
+  button_edit_non_working_time: Edit time off
+  label_continued_from_previous_year: continued from previous year
+  label_continues_into_next_year: continues into next year
+  label_end_date: Finish date
+  label_working_days: Working days
+  label_non_working_times_with_count: "%{year} time off (%{count})"
+  label_non_working_times_summary: "%{year} summary"
+  label_total_user_non_working_times: Personal non-working days
+  label_total_global_non_working_days: Global non-working days
+  label_total_days_off: Total days off
+  macro_execution_error: Error executing the macro %{macro_name}
+  macro_unavailable: Macro %{macro_name} cannot be displayed.
+  macros:
+    placeholder: "[Placeholder] Macro %{macro_name}"
+    errors:
+      missing_or_invalid_parameter: Missing or invalid macro parameter.
+    legacy_warning:
+      timeline: This legacy timeline macro has been removed and is no longer available. You can replace the functionality with an embedded table macro.
+    include_wiki_page:
+      removed: The macro does no longer exist.
+    wiki_child_pages:
+      errors:
+        page_not_found: Cannot find the wiki page '%{name}'.
+    create_work_package_link:
+      errors:
+        no_project_context: Calling create_work_package_link macro from outside project context.
+        invalid_type: No type found with name '%{type}' in project '%{project}'.
+      link_name: New work package
+      link_name_type: New %{type_name}
+  mail:
+    actions: Actions
+    digests:
+      including_mention_singular: including a mention
+      including_mention_plural: including %{number_mentioned} mentions
+      unread_notification_singular: 1 unread notification
+      unread_notification_plural: "%{number_unread} unread notifications"
+      you_have: You have
+    logo_alt_text: Logo
+    mention:
+      subject: "%{user_name} mentioned you in %{id} - %{subject}"
+    notification:
+      center: To notification center
+      see_in_center: See comment in notification center
+      settings: Change email settings
+    salutation: Hello %{user},
+    salutation_full_name: Full name
+    work_packages:
+      created_at: 'Created at %{timestamp} by %{user} '
+      login_to_see_all: Log in to see all notifications.
+      mentioned: You have been <b>mentioned in a comment</b>
+      mentioned_by: "%{user} mentioned you in a comment"
+      more_to_see:
+        one: There is 1 more work package with notifications.
+        other: There are %{count} more work packages with notifications.
+      open_in_browser: Open in browser
+      reason:
+        watched: Watched
+        assigned: Assigned
+        responsible: Accountable
+        mentioned: Mentioned
+        shared: Shared
+        subscribed: all
+        prefix: 'Received because of the notification setting: %{reason}'
+        date_alert_start_date: Date alert
+        date_alert_due_date: Date alert
+        reminder: Reminder
+      see_all: See all
+      updated_at: Updated at %{timestamp} by %{user}
+    reminder_notifications:
+      subject: 'Reminder: %{note}'
+      heading: You have a new reminder
+      note: 'Note: “%{note}”'
+    sharing:
+      work_packages:
+        allowed_actions_html: 'You have the following permissions on this work package: %{allowed_actions}. This can change depending on your project role and permissions.'
+        create_account: To access this work package, you will need to create and activate an account on %{instance}.
+        open_work_package: Open work package
+        subject: Work package %{id} was shared with you
+        enterprise_text: Share work packages with users who are not members of the project.
+        summary:
+          user: "%{user} shared a work package with you with %{role_rights} rights"
+          group: "%{user} shared a work package with the group %{group} you are a member of"
+    storages:
+      health:
+        plaintext:
+          storage: Storage
+          healthy:
+            summary: Good news! The status of your storage, %{storage_name}, is currently displaying as "Healthy".
+            error-solved-on: Solved On
+            recommendation: We will continue monitoring the system to ensure it remains in good health. In case of any discrepancies, we will notify you.
+            details: For more details or to make any necessary amendments, you can visit your storage configuration
+          unhealthy:
+            summary: The status of your storage, %{storage_name}, is currently displaying as "Error". We've detected an issue that might require your attention.
+            error-details: Error Details
+            error-message: Error Message
+            error-occurred-on: Occurred On
+            recommendation: We recommend heading over to the storage configuration page to address this issue
+            unsubscribe: If you would no longer like to receive these notifications, you can unsubscribe at any time. To unsubscribe, please follow the instructions on this page
+        email_notification_settings: Storage email notification settings
+        see_storage_settings: See storage settings
+        healthy:
+          subject: Storage "%{name}" is now healthy!
+          solved_at: solved at
+          summary: The problem with your %{storage_name} storage integration is now solved
+        unhealthy:
+          subject: Storage "%{name}" is unhealthy!
+          since: since
+          summary: There is a problem with your %{storage_name} storage integration
+          troubleshooting:
+            text: For more information, check file storages
+            link_text: troubleshooting documentation
+  mail_body_account_activation_request: 'A new user (%{value}) has registered. The account is pending your approval:'
+  mail_body_account_information: Your account information
+  mail_body_account_information_external: You can use your %{value} account to log in.
+  mail_body_backup_ready: 'Your requested backup is ready. You can download it here:'
+  mail_body_backup_token_reset_admin_info: The backup token for user '%{user}' has been reset.
+  mail_body_backup_token_reset_user_info: Your backup token has been reset.
+  mail_body_backup_token_info: The previous token is no longer valid.
+  mail_body_backup_waiting_period: The new token will be enabled in %{hours} hours.
+  mail_body_backup_token_warning: If this wasn't you, login to OpenProject immediately and reset it again.
+  mail_body_incoming_email_error: The email you sent to OpenProject could not be processed.
+  mail_body_incoming_email_error_in_reply_to: At %{received_at} %{from_email} wrote
+  mail_body_incoming_email_error_logs: Logs
+  mail_body_lost_password: 'To change your password, click on the following link:'
+  mail_password_change_not_possible:
+    title: Password change not possible
+    body: Your account at %{app_title} is connected to an external authentication provider (%{name}).
+    subtext: Passwords for external account cannot be changed in the application. Please use the lost password functionality of your authentication provider.
+  mail_body_register: 'Welcome to %{app_title}. Please activate your account by clicking on this link:'
+  mail_body_register_header_title: Project member invitation email
+  mail_body_register_user: 'Dear %{name}, '
+  mail_body_register_links_html: |
+    Please feel free to browse our youtube channel (%{youtube_link}) where we provide a webinar (%{webinar_link})
+    and “Get started” videos (%{get_started_link}) to make your first steps in OpenProject as easy as possible.
+    <br />
+    If you have any further questions, consult our documentation (%{documentation_link}) or contact your administrator.
+  mail_body_register_closing: Your OpenProject team
+  mail_body_register_ending: Stay connected! Kind regards,
+  mail_body_reminder: "%{count} work package(s) that are assigned to you are due in the next %{days} days:"
+  mail_body_group_reminder: '%{count} work package(s) that are assigned to group "%{group}" are due in the next %{days} days:'
+  mail_body_wiki_page_added: The '%{id}' wiki page has been added by %{author}.
+  mail_body_wiki_page_updated: The '%{id}' wiki page has been updated by %{author}.
+  mail_subject_account_activation_request: "%{value} account activation request"
+  mail_subject_backup_ready: Your backup is ready
+  mail_subject_backup_token_reset: Backup token reset
+  mail_subject_incoming_email_error: An email you sent to OpenProject could not be processed
+  mail_subject_lost_password: Your %{value} password
+  mail_subject_register: Your %{value} account activation
+  mail_subject_wiki_content_added: "'%{id}' wiki page has been added"
+  mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
+  mail_member_added_project:
+    subject: "%{project} - You have been added as a member"
+    body:
+      added_by:
+        without_message: "%{user} added you as a member to the project '%{project}'."
+        with_message: "%{user} added you as a member to the project '%{project}' writing:"
+      roles: 'You have the following roles:'
+  mail_member_updated_project:
+    subject: "%{project} - Your roles have been updated"
+    body:
+      updated_by:
+        without_message: "%{user} updated the roles you have in the project '%{project}'."
+        with_message: "%{user} updated the roles you have in the project '%{project}' writing:"
+      roles: 'You now have the following roles:'
+  mail_member_updated_global:
+    subject: Your global permissions have been updated
+    body:
+      updated_by:
+        without_message: "%{user} updated the roles you have globally."
+        with_message: "%{user} updated the roles you have globally writing:"
+      roles: 'You now have the following roles:'
+  mail_user_activation_limit_reached:
+    subject: User activation limit reached
+    message_html: |
+      A new user (%{email}) tried to create an account on an OpenProject environment that you manage (%{host}).
+      The user cannot activate their account since the user limit has been reached.
+    steps:
+      label: 'To allow the user to sign in you can either: '
+      a: Upgrade your payment plan ([here](upgrade_url))
+      b: Lock or delete an existing user ([here](users_url))
+  more_actions: More functions
+  noscript_description: You need to activate JavaScript in order to use OpenProject!
+  noscript_heading: JavaScript disabled
+  noscript_learn_more: Learn more
+  notice_accessibility_mode: The accessibility mode can be enabled in your [account settings](url).
+  notice_account_activated: Your account has been activated. You can now log in.
+  notice_account_already_activated: The account has already been activated.
+  notice_account_invalid_token: Invalid activation token
+  notice_account_invalid_credentials: Invalid user or password
+  notice_account_invalid_credentials_or_blocked: Invalid user or password or the account is blocked due to multiple failed login attempts. If so, it will be unblocked automatically in a short time.
+  notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
+  notice_account_new_password_forced: A new password is required.
+  notice_account_password_expired: Your password expired after %{days} days. Please set a new one.
+  notice_account_password_updated: Password was successfully updated.
+  notice_account_pending: Your account was created and is now pending administrator approval.
+  notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
+  notice_account_unknown_email: Unknown user.
+  notice_account_update_failed: Account setting could not be saved. Please have a look at your account page.
+  notice_account_updated: Account was successfully updated.
+  notice_account_other_session_expired: All other sessions tied to your account have been invalidated.
+  notice_account_wrong_password: Wrong password
+  notice_account_registered_and_logged_in: Welcome, your account has been activated. You are logged in now.
+  notice_activation_failed: The account could not be activated.
+  notice_auth_stage_verification_error: Could not verify stage '%{stage}'.
+  notice_auth_stage_wrong_stage: Expected to finish authentication stage '%{expected}', but '%{actual}' returned.
+  notice_auth_stage_error: Authentication stage '%{stage}' failed.
+  notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
+  notice_custom_options_deleted: Option '%{option_value}' and its %{num_deleted} occurrences were deleted.
+  notice_email_error: An error occurred while sending mail (%{value})
+  notice_email_sent: An email was sent to %{value}
+  notice_failed_to_save_work_packages: 'Failed to save %{count} work package(s) on %{total} selected: %{ids}.'
+  notice_failed_to_save_members: 'Failed to save member(s): %{errors}.'
+  notice_deletion_scheduled: The deletion has been scheduled and is performed asynchronously.
+  notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
+  notice_forced_logout: You have been automatically logged out after %{ttl_time} minutes of inactivity.
+  notice_internal_server_error: An error occurred on the page you were trying to access. If you continue to experience problems please contact your %{app_title} administrator for assistance.
+  notice_locking_conflict: Information has been updated by at least one other user in the meantime.
+  notice_locking_conflict_additional_information: The update(s) came from %{users}.
+  notice_locking_conflict_reload_page: Please reload the page, review the changes and reapply your updates.
+  notice_locking_conflict_warning: This page has been updated by someone else. To not lose your edits, copy them locally and reload to view the updated version.
+  notice_locking_conflict_danger: Could not save your changes because of conflicting modifications. To not lose your edits, copy them locally and reload to view the updated version.
+  notice_locking_conflict_action_button: Discard changes and reload
+  notice_member_added: Added %{name} to the project.
+  notice_members_added: Added %{number} users to the project.
+  notice_member_removed: Removed %{user} from project.
+  notice_member_deleted: "%{user} has been removed from the project and deleted."
+  notice_no_principals_found: No results found.
+  notice_bad_request: Bad Request.
+  notice_not_authorized: You are not authorized to access this page.
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
+  notice_requires_enterprise_token: Enterprise token missing or doesn't allow access to this page.
+  notice_password_confirmation_failed: The entered password is not correct.
+  notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result."
+  notice_principals_found_single: "There is one result. \n Tab to focus it."
+  notice_parent_item_not_found: Parent item not found.
+  notice_project_not_deleted: The project wasn't deleted.
+  notice_project_not_found: Project not found.
+  notice_smtp_address_unsafe_env_hint: SMTP address %{address} is not safe. Please add it to the whitelist using the %{env_name} environment variable.
+  notice_successful_connection: Successful connection.
+  notice_successful_create: Successful creation.
+  notice_successful_delete: Successful deletion.
+  notice_successful_cancel: Successful cancellation.
+  notice_successful_update: Successful update.
+  notice_successful_move: Successful move from %{from} to %{to}.
+  notice_unsuccessful_create: Creation failed.
+  notice_unsuccessful_create_with_reason: 'Creation failed: %{reason}'
+  notice_unsuccessful_update: Update failed.
+  notice_unsuccessful_update_with_reason: 'Update failed: %{reason}'
+  notice_successful_update_custom_fields_added_to_project: |
+    Successful update. The custom fields of the activated types are automatically activated
+    on the work package form. <a href="%{url}" target="_blank">See more</a>.
+  notice_to_many_principals_to_display: |-
+    There are too many results.
+    Narrow down the search by typing in the name of the new member (or group).
+  notice_user_missing_authentication_method: User has yet to choose a password or another way to sign in.
+  notice_user_invitation_resent: An invitation has been sent to %{email}.
+  present_access_key_value: 'Your %{key_name} is: %{value}'
+  notice_automatic_set_of_standard_type: Set standard type automatically.
+  notice_logged_out: You have been logged out.
+  notice_wont_delete_auth_source: The LDAP connection cannot be deleted as long as there are still users using it.
+  notice_project_cannot_update_custom_fields: 'You cannot update the project''s available custom fields. The project is invalid: %{errors}'
+  notice_attachment_migration_wiki_page: 'This page was generated automatically during the update of OpenProject. It contains all attachments previously associated with the %{container_type} "%{container_name}".
+
+    '
+  number:
+    format:
+      delimiter: ","
+      precision: 3
+      separator: "."
+    human:
+      format:
+        delimiter: ''
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: kB
+          mb: MB
+          tb: TB
+  onboarding:
+    heading_getting_started: Get an overview
+    text_getting_started_description: Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu.
+    welcome: Welcome to %{app_title}
+    select_language: Please select your language
+  open_project:
+    common:
+      work_package_card_component:
+        menu:
+          label_actions: Work package actions
+  permission_add_work_package_comments: Add comments
+  permission_add_work_packages: Add work packages
+  permission_add_messages: Post messages
+  permission_add_project: Create projects
+  permission_add_portfolios: Create portfolios
+  permission_add_programs: Create programs
+  permission_add_work_package_attachments: Add attachments
+  permission_add_work_package_attachments_explanation: Allows adding attachments without Edit work packages permission
+  permission_add_internal_comments: Write internal comments
+  permission_archive_project: Archive project
+  permission_create_user: Create users
+  permission_manage_user: Edit users
+  permission_manage_placeholder_user: Create, edit, and delete placeholder users
+  permission_add_subprojects: Create subprojects
+  permission_add_work_package_watchers: Add watchers
+  permission_assign_versions: Assign versions
+  permission_browse_repository: Read-only access to repository (browse and checkout)
+  permission_change_work_package_status: Change work package status
+  permission_change_work_package_status_explanation: Allows changing status without Edit work packages permission
+  permission_comment_news: Comment news
+  permission_commit_access: Read/write access to repository (commit)
+  permission_copy_projects: Copy projects
+  permission_copy_projects_explanation: In template projects, this permission has a secondary function, it allows the creation of new projects derived from the template.
+  permission_copy_work_packages: Duplicate work packages
+  permission_create_backup: Create backups
+  permission_delete_work_package_watchers: Delete watchers
+  permission_delete_work_packages: Delete work packages
+  permission_delete_messages: Delete messages
+  permission_delete_own_messages: Delete own messages
+  permission_delete_reportings: Delete reportings
+  permission_delete_timelines: Delete timelines
+  permission_edit_work_package_comments: Moderate comments
+  permission_edit_work_package_comments_explanation: 'Caution: Users with this permission are able to edit anyone''s comment.'
+  permission_edit_work_packages: Edit work packages
+  permission_edit_messages: Edit messages
+  permission_edit_own_internal_comments: Edit own internal comments
+  permission_edit_own_work_package_comments: Edit own comments
+  permission_edit_own_messages: Edit own messages
+  permission_edit_own_time_entries: Edit own time logs
+  permission_edit_others_internal_comments: Moderate internal comments
+  permission_edit_others_internal_comments_explanation: 'Caution: Users with this permission are able to edit other users'' internal comments.'
+  permission_edit_project: Edit project
+  permission_edit_project_attributes: Edit project attributes
+  permission_edit_project_phases: Edit project phases
+  permission_edit_reportings: Edit reportings
+  permission_edit_time_entries: Edit time logs for other users
+  permission_edit_timelines: Edit timelines
+  permission_edit_wiki_pages: Edit wiki pages
+  permission_export_work_packages: Export work packages
+  permission_export_projects: Export projects
+  permission_invite_members_by_email: Invite members by email
+  permission_invite_members_by_email_explanation: 'Allows users to invite new members by email. Invited users will receive an email with a link to set their password and activate their account. Depends on the permission to manage members
+
+    '
+  permission_log_own_time: Log own time
+  permission_log_time: Log time for other users
+  permission_manage_forums: Manage forums
+  permission_manage_categories: Manage work package categories
+  permission_manage_dashboards: Manage dashboards
+  permission_manage_work_package_relations: Manage work package relations
+  permission_manage_members: Manage members
+  permission_manage_news: Manage news
+  permission_manage_project_activities: Manage project activities
+  permission_manage_public_queries: Manage public views
+  permission_manage_repository: Manage repository
+  permission_manage_subtasks: Manage work package hierarchies
+  permission_manage_versions: Manage versions
+  permission_manage_wiki: Manage wiki
+  permission_manage_own_working_times: Manage own working times
+  permission_manage_own_working_times_explanation: 'Allows users to manage their own working times, and personal non-working days.
+
+    '
+  permission_manage_working_times: Manage working times for all users
+  permission_manage_working_times_explanation: 'Allows users to manage working times for all users, including personal non-working days.
+
+    '
+  permission_move_work_packages: Move work packages
+  permission_save_queries: Save views
+  permission_search_project: Search project
+  permission_select_custom_fields: Select custom fields
+  permission_select_project_custom_fields: Select project attributes
+  permission_select_project_phases: Select project phases
+  permission_select_project_phases_explanation: Activate/Deactivate the phases in a project. Enables the user to select the life cycle appropriate for the project as inactive phases will not be visible in the project overview page nor the project list.
+  permission_select_project_modules: Select project modules
+  permission_share_work_packages: Share work packages
+  permission_manage_types: Select types
+  permission_manage_own_reminders: Create own reminders
+  permission_view_all_principals: View all users and groups
+  permission_view_all_principals_explanation: 'Allows users to see all users and groups in the system, even if they are not members of any joined projects or groups.
+
+    '
+  permission_view_project: View projects
+  permission_view_changesets: View repository revisions in OpenProject
+  permission_view_internal_comments: View internal comments
+  permission_view_commit_author_statistics: View commit author statistics
+  permission_view_dashboards: View dashboards
+  permission_view_work_package_watchers: View watchers list
+  permission_view_work_packages: View work packages
+  permission_view_messages: View messages
+  permission_view_news: View news
+  permission_view_members: View members
+  permission_view_reportings: View reportings
+  permission_view_shared_work_packages: View work package shares
+  permission_view_time_entries: View spent time
+  permission_view_timelines: View timelines
+  permission_view_user_email: View users' mail addresses
+  permission_view_wiki_edits: View wiki history
+  permission_view_wiki_pages: View wiki
+  permission_work_package_assigned: Become assignee/responsible
+  permission_work_package_assigned_explanation: Work packages can be assigned to users and groups in possession of this role in the respective project
+  permission_view_project_activity: View project activity
+  permission_view_project_attributes: View project attributes
+  permission_view_project_phases: View project phases
+  permission_save_bcf_queries: Save BCF queries
+  permission_manage_public_bcf_queries: Manage public BCF queries
+  permission_edit_attribute_help_texts: Edit attribute help texts
+  permission_manage_public_project_queries: Manage public project lists
+  permission_view_project_query: View project query
+  permission_edit_project_query: Edit project query
+  placeholders:
+    default: "-"
+    templated_hint: Automatically generated through type %{type}
+  portfolio:
+    count:
+      zero: 0 portfolios
+      one: 1 portfolio
+      other: "%{count} portfolios"
+  program:
+    count:
+      zero: 0 programs
+      one: 1 program
+      other: "%{count} programs"
+  project:
+    archive:
+      title: Archive project
+      are_you_sure: Are you sure you want to archive the project '%{name}'?
+      archived: Archived
+    count:
+      zero: 0 projects
+      one: 1 project
+      other: "%{count} projects"
+    destroy:
+      title: Delete project
+      heading: Permanently delete this project?
+      confirmation_message_for_subprojects_html:
+        zero: 'You are about to permanently delete all data relating to project <strong>%{name}</strong>.
+
+          '
+        one: 'You are about to permanently delete all data relating to project <strong>%{name}</strong> and this subproject:
+
+          '
+        other: 'You are about to permanently delete all data relating to project <strong>%{name}</strong> and these subprojects:
+
+          '
+    filters:
+      project_phase: 'Project phase: %{phase}'
+      project_phase_any: 'Project phase: Any'
+      project_phase_gate: 'Project phase gate: %{gate}'
+    identifier:
+      warning_one: Members of the project will have to relocate the project's repositories.
+      warning_two: Existing links to the project will no longer work.
+      title: Change the project's identifier
+    not_available: Project N/A
+    template:
+      copying_title: Applying template
+      copying: 'Your project is being created from the selected template project. You will be notified by mail as soon as the project is available.
+
+        '
+      use_template: Use template
+      make_template: Set as template
+      remove_from_templates: Remove from templates
+  project_module_activity: Activity
+  project_module_forums: Forums
+  project_module_work_package_tracking: Work packages
+  project_module_news: News
+  project_module_repository: Repository
+  project_module_wiki: Wiki
+  permission_header_for_project_module_work_package_tracking: Work packages and Gantt charts
+  query:
+    attribute_and_direction: "%{attribute} (%{direction})"
+  query_fields:
+    active_or_archived: Active or archived
+    assigned_to_role: Assignee's role
+    assignee_or_group: Assignee or belonging group
+    member_of_group: Assignee's group
+    name_or_identifier: Name or identifier
+    only_subproject_id: Only subproject
+    shared_with_user: Shared with users
+    shared_with_me: Shared with me
+    subproject_id: Including subproject
+  repositories:
+    at_identifier: at %{identifier}
+    atom_revision_feed: Atom revision feed
+    autofetch_information: |-
+      Check this if you want repositories to be updated automatically when accessing the repository module page.
+      This encompasses the retrieval of commits from the repository and refreshing the required disk storage.
+    checkout:
+      access:
+        readwrite: Read + Write
+        read: Read-only
+        none: No checkout access, you may only view the repository through this application.
+      access_permission: Your permissions on this repository
+      url: Checkout URL
+      base_url_text: |-
+        The base URL to use for generating checkout URLs (e.g., https://myserver.example.org/repos/).
+        Note: The base URL is only used for rewriting checkout URLs in managed repositories. Other repositories are not altered.
+      default_instructions:
+        git: |-
+          The data contained in this repository can be downloaded to your computer with Git.
+          Please consult the documentation of Git if you need more information on the checkout procedure and available clients.
+        subversion: |-
+          The data contained in this repository can be downloaded to your computer with Subversion.
+          Please consult the documentation of Subversion if you need more information on the checkout procedure and available clients.
+      enable_instructions_text: Displays checkout instructions defined below on all repository-related pages.
+      instructions: Checkout instructions
+      show_instructions: Display checkout instructions
+      text_instructions: This text is displayed alongside the checkout URL for guidance on how to check out the repository.
+      not_available: Checkout instructions are not defined for this repository. Ask your administrator to enable them for this repository in the system settings.
+    create_managed_delay: 'Please note: The repository is managed, it is created asynchronously on the disk and will be available shortly.'
+    create_successful: The repository has been registered.
+    delete_sucessful: The repository has been deleted.
+    destroy:
+      confirmation: If you continue, this will permanently delete the managed repository.
+      info: Deleting the repository is an irreversible action.
+      info_not_managed: 'Note: This will NOT delete the contents of this repository, as it is not managed by OpenProject.'
+      managed_path_note: 'The following directory will be erased: %{path}'
+      repository_verification_html: Enter the project's identifier %{identifier} to verify the deletion of its repository.
+      subtitle: Do you really want to delete the %{repository_type} of the project %{project_name}?
+      subtitle_not_managed_html: Do you really want to remove the linked %{repository_type} %{url} from the project %{project_name}?
+      title_html: Delete the %{repository_type}
+      title_not_managed: Remove the linked %{repository_type}?
+    errors:
+      build_failed: Unable to create the repository with the selected configuration. %{reason}
+      managed_delete: Unable to delete the managed repository.
+      managed_delete_local: 'Unable to delete the local repository on filesystem at ''%{path}'': %{error_message}'
+      empty_repository: The repository exists, but is empty. It does not contain any revisions yet.
+      exists_on_filesystem: The repository directory already exists in the filesystem.
+      filesystem_access_failed: 'An error occurred while accessing the repository in the filesystem: %{message}'
+      not_manageable: This repository vendor cannot be managed by OpenProject.
+      path_permission_failed: 'An error occurred trying to create the following path: %{path}. Please ensure that OpenProject may write to that folder.'
+      unauthorized: You're not authorized to access the repository or the credentials are invalid.
+      unavailable: The repository is unavailable.
+      exception_title: 'Cannot access the repository: %{message}'
+      disabled_or_unknown_type: The selected type %{type} is disabled or no longer available for the SCM vendor %{vendor}.
+      disabled_or_unknown_vendor: The SCM vendor %{vendor} is disabled or no longer available.
+      remote_call_failed: 'Calling the managed remote failed with message ''%{message}'' (Code: %{code})'
+      remote_invalid_response: Received an invalid response from the managed remote.
+      remote_save_failed: Could not save the repository with the parameters retrieved from the remote.
+    git:
+      instructions:
+        managed_url: This is the URL of the managed (local) Git repository.
+        path: Specify the path to your local Git repository ( e.g., %{example_path} ). You can also use remote repositories which are cloned to a local copy by using a value starting with http(s):// or file://.
+        path_encoding: 'Override Git path encoding (Default: UTF-8)'
+      local_title: Link existing local Git repository
+      local_url: Local URL
+      local_introduction: If you have an existing local Git repository, you can link it with OpenProject to access it from within the application.
+      managed_introduction: Let OpenProject create and integrate a local Git repository automatically.
+      managed_title: Git repository integrated into OpenProject
+      managed_url: Managed URL
+      path: Path to Git repository
+      path_encoding: Path encoding
+    go_to_revision: Go to revision
+    managed_remote: Managed repositories for this vendor are handled remotely.
+    managed_remote_note: Information on the URL and path of this repository is not available prior to its creation.
+    managed_url: Managed URL
+    settings:
+      automatic_managed_repos_disabled: Disable automatic creation
+      automatic_managed_repos: Automatic creation of managed repositories
+      automatic_managed_repos_text: By setting a vendor here, newly created projects will automatically receive a managed repository of this vendor.
+    scm_vendor: Source control management system
+    scm_type: Repository type
+    scm_types:
+      local: Link existing local repository
+      existing: Link existing repository
+      managed: Create new repository in OpenProject
+    storage:
+      not_available: Disk storage consumption is not available for this repository.
+      update_timeout: |-
+        Keep the last required disk space information for a repository for N minutes.
+        As counting the required disk space of a repository may be costly, increase this value to reduce performance impact.
+      oauth_application_details_html: 'The client secret value will not be accessible again after you close this window. Please copy these values into the Nextcloud OpenProject Integration settings:'
+      oauth_application_details_link_text: Go to settings page
+      setup_documentation_details: 'If you need help configuring a new file storage please check the documentation: '
+      setup_documentation_details_link_text: File storages setup
+      show_warning_details: To use this file storage remember to activate the module and the specific storage in the project settings of each desired project.
+    subversion:
+      existing_title: Existing Subversion repository
+      existing_introduction: If you have an existing Subversion repository, you can link it with OpenProject to access it from within the application.
+      existing_url: Existing URL
+      instructions:
+        managed_url: This is the URL of the managed (local) Subversion repository.
+        url: |-
+          Enter the repository URL. This may either target a local repository (starting with %{local_proto} ), or a remote repository.
+          The following URL schemes are supported:
+      managed_title: Subversion repository integrated into OpenProject
+      managed_introduction: Let OpenProject create and integrate a local Subversion repository automatically.
+      managed_url: Managed URL
+      password: Repository Password
+      username: Repository username
+    truncated: Sorry, we had to truncate this directory to %{limit} files. %{truncated} entries were omitted from the list.
+    named_repository: "%{vendor_name} repository"
+    update_settings_successful: The settings have been successfully saved.
+    url: URL to repository
+    warnings:
+      cannot_annotate: This file cannot be annotated.
+  scheduling:
+    manual: set to Manual
+    automatic: set to Automatic
+  search_input_placeholder: Search ...
+  setting_allowed_link_protocols: Allowed link protocols
+  setting_allowed_link_protocols_text_html: Allow these protocols to be rendered as links in work package descriptions, long text fields and comments. For example, %{tel_code} or %{element_code}. Enter one protocol per line. <br/> Protocols %{http_code}, %{https_code}, and %{mailto_code} are always allowed.
+  setting_capture_external_links: Capture external links
+  setting_capture_external_links_text: 'When enabled, all external links in formatted text will redirect through a warning page before leaving the application. This helps protect users from potentially malicious external websites.
+
+    '
+  setting_capture_external_links_require_login: Require users to be logged in
+  setting_capture_external_links_require_login_text: 'When enabled, users wanting to click on external links need to be logged in before being able to continue.
+
+    '
+  setting_after_first_login_redirect_url: First login redirect
+  setting_after_first_login_redirect_url_text_html: 'Set a path to redirect users after their first login. If empty, redirects to the home page for the onboarding tour. <br/> Example: <code>/my/page</code>
+
+    '
+  setting_after_login_default_redirect_url: After login redirect
+  setting_after_login_default_redirect_url_example_html: 'Set a default path to redirect users after login, if no back link was provided. Redirects to home page if not set. <br/> Example: %{example_code}
+
+    '
+  setting_apiv3_cors_title: Cross-Origin Resource Sharing (CORS)
+  setting_apiv3_cors_enabled: Enable CORS
+  setting_apiv3_cors_origins: API V3 Cross-Origin Resource Sharing (CORS) allowed origins
+  setting_apiv3_cors_origins_instructions_html: 'If CORS is enabled, these are the origins that are allowed to access OpenProject API. <br/> Please check the [Documentation on the Origin header](docs_url) on how to specify the expected values.
+
+    '
+  setting_apiv3_write_readonly_attributes: Write access to read-only attributes
+  setting_apiv3_write_readonly_attributes_instructions: 'If enabled, the API will allow administrators to write static read-only attributes during creation, such as createdAt and author.
+
+    '
+  setting_apiv3_write_readonly_attributes_warning: 'This setting has a use-case for e.g., importing data, but allows administrators to impersonate the creation of items as other users. All creation requests are being logged however with the true author.
+
+    '
+  setting_apiv3_write_readonly_attributes_additional_html: 'For more information on attributes and supported resources, please see the [API documentation](api_documentation_link).
+
+    '
+  setting_apiv3_max_page_size: Maximum API page size
+  setting_apiv3_max_page_size_instructions: 'Set the maximum page size the API will respond with. It will not be possible to perform API requests that return more values on a single page.
+
+    '
+  setting_apiv3_max_page_size_warning: 'Please only change this value if you are sure why you need it. Setting to a high value will result in significant performance impacts, while a value lower than the per page options will cause errors in paginated views.
+
+    '
+  setting_apiv3_docs: Documentation
+  setting_apiv3_docs_enabled: Enable docs page
+  setting_apiv3_docs_enabled_instructions_html: 'If the docs page is enabled you can get an interactive view of the APIv3 documentation under <a href="%{link}" target="_blank">%{link}</a>.
+
+    '
+  setting_apiv3_docs_enabled_instructions_warning: 'Please be aware that enabling the API docs on a production system may expose sensitive information or result in accidental loss of data when not being careful. We recommend to only enable this setting for development purposes.
+
+    '
+  setting_attachment_whitelist: Attachment upload whitelist
+  setting_email_delivery_method: Email delivery method
+  setting_emails_salutation: Address user in emails with
+  setting_oauth_allow_remapping_of_existing_users: Allow remapping of existing users
+  setting_sendmail_location: Location of the sendmail executable
+  setting_sendmail_arguments: Arguments for sendmail
+  setting_smtp_enable_starttls_auto: Automatically use STARTTLS if available
+  setting_smtp_ssl: Use SSL connection
+  setting_smtp_address: SMTP server
+  setting_smtp_port: SMTP port
+  setting_smtp_authentication: SMTP authentication
+  setting_smtp_user_name: SMTP username
+  setting_smtp_password: SMTP password
+  setting_smtp_domain: SMTP HELO domain
+  setting_activity_days_default: Days displayed on project activity
+  setting_api_tokens_enabled: Enable API tokens
+  setting_api_tokens_enabled_caption: 'Decide whether users can create personal API tokens in their account settings. These tokens can be used to access the different APIs of OpenProject, such as APIv3 and MCP.
+
+    '
+  setting_app_subtitle: Application subtitle
+  setting_app_title: Application title
+  setting_organization_name: Organization name
+  setting_attachment_max_size: Attachment max. size
+  setting_show_work_package_attachments: Show attachments in the files tab by default
+  setting_antivirus_scan_mode: Scan mode
+  setting_antivirus_scan_action: Infected file action
+  setting_autofetch_changesets: Autofetch repository changes
+  setting_autologin: Autologin
+  setting_available_languages: Available languages
+  setting_bcc_recipients: Blind carbon copy recipients (bcc)
+  setting_brute_force_block_after_failed_logins: Block user after this number of failed login attempts
+  setting_brute_force_block_minutes: Time the user is blocked for
+  setting_cache_formatted_text: Cache formatted text
+  setting_use_wysiwyg_description: Select to enable CKEditor5 WYSIWYG editor for all users by default. CKEditor has limited functionality for GFM Markdown.
+  setting_column_options: Default work package lists columns
+  setting_commit_fix_keywords: Fixing keywords
+  setting_commit_logs_encoding: Commit messages encoding
+  setting_commit_logtime_activity_id: Activity for logged time
+  setting_commit_logtime_enabled: Enable time logging
+  setting_commit_ref_keywords: Referencing keywords
+  setting_consent_time: Consent time
+  setting_consent_info: Consent information text
+  setting_consent_required: Consent required
+  setting_consent_decline_mail: Consent contact mail address
+  setting_cross_project_work_package_relations: Allow cross-project work package relations
+  setting_first_week_of_year: First week in year contains
+  setting_date_format: Date
+  setting_default_language: Default language
+  setting_default_projects_modules: Default enabled modules for new projects
+  setting_default_projects_public: New projects are public by default
+  setting_disable_password_login: Disable password authentication
+  setting_diff_max_lines_displayed: Max number of diff lines displayed
+  setting_omniauth_direct_login_provider: Direct login SSO provider
+  setting_display_subprojects_work_packages: Display subprojects work packages on main projects by default
+  setting_duration_format: Duration format
+  setting_duration_format_hours_only: Hours only
+  setting_duration_format_days_and_hours: Days and hours
+  setting_duration_format_instructions: This defines how Work, Remaining work, and Time spent durations are displayed.
+  setting_emails_footer: Emails footer
+  setting_emails_header: Emails header
+  setting_email_login: Use email as login
+  setting_enabled_scm: Enabled SCM
+  setting_enabled_projects_columns: Columns in a projects list displayed by default
+  setting_feeds_enabled: Enable Feeds
+  setting_ical_enabled: Enable iCalendar subscriptions
+  setting_feeds_limit: Feed content limit
+  setting_file_max_size_displayed: Max size of text files displayed inline
+  setting_host_name: Host name
+  setting_collaborative_editing_hocuspocus_url: Hocuspocus server URL
+  setting_collaborative_editing_hocuspocus_secret: Hocuspocus server secret
+  setting_hours_per_day: Hours per day
+  setting_hours_per_day_explanation: This defines what is considered a "day" when displaying duration in days and hours (for example, if a day is 8 hours, 32 hours would be 4 days).
+  setting_invitation_expiration_days: Activation email expires after
+  setting_invitation_expiration_days_caption: Number of days after which the activation email expires.
+  setting_work_package_done_ratio: Progress calculation mode
+  setting_work_package_done_ratio_field: Work-based
+  setting_work_package_done_ratio_field_caption_html: "<i>% Complete</i> can be freely set to any value. If you optionally enter a value for <i>Work</i>, <i>Remaining work</i> will automatically be derived."
+  setting_work_package_done_ratio_status: Status-based
+  setting_work_package_done_ratio_status_caption_html: Each status has a <i>% Complete</i> value associated with it. Changing status will change <i>% Complete</i>.
+  setting_work_package_done_ratio_explanation_html: 'In <b>work-based</b> mode, % Complete can be freely set to any value. If you optionally enter a value for Work, Remaining work will automatically be derived. In <b>status-based</b> mode, each status has a % Complete value associated with it. Changing status will change % Complete.
+
+    '
+  setting_work_package_properties: Work package properties
+  setting_work_package_startdate_is_adddate: Use current date as start date for new work packages
+  setting_work_packages_projects_export_limit: Work packages / Projects export limit
+  setting_journal_aggregation_time_minutes: Aggregation period
+  setting_log_requesting_user: Log user login, name, and mail address for all requests
+  setting_login_required: Authentication required
+  setting_login_required_caption: When checked, all requests to the application have to be authenticated.
+  setting_lost_password: Enable password reset
+  setting_lost_password_caption: When checked, allow users to reset their own passwords.
+  setting_mail_from: Emission email address
+  setting_mail_handler_api_key: API key
+  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
+  setting_mail_handler_body_delimiter_regex: Truncate emails matching this regex
+  setting_mail_handler_ignore_filenames: Ignored mail attachments
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  setting_new_project_user_role_id_caption: 'Only roles that include the permissions to edit project attributes and to manage members are listed, so that the creator can complete the project setup.
+
+    '
+  setting_new_project_send_confirmation_email: Send notification to author when creating a new project
+  setting_new_project_notification_text: Notification text
+  setting_password_active_rules: Password requirements
+  setting_password_count_former_banned: Number of most recently used passwords banned for reuse
+  setting_password_days_valid: Number of days, after which to enforce a password change
+  setting_password_min_length: Minimum length
+  setting_per_page_options: Objects per page options
+  setting_percent_complete_on_status_closed: "% Complete when status is closed"
+  setting_percent_complete_on_status_closed_no_change: No change
+  setting_percent_complete_on_status_closed_no_change_caption_html: The value of <i>% Complete</i> will not change even when a work package is closed.
+  setting_percent_complete_on_status_closed_set_100p: Automatically set to 100%
+  setting_percent_complete_on_status_closed_set_100p_caption: A closed work package is considered complete.
+  setting_plain_text_mail: Plain text mail (no HTML)
+  setting_protocol: Protocol
+  setting_project_gantt_query: Project portfolio Gantt view
+  setting_project_gantt_query_text: You can modify the query that is used to display Gantt chart from the project overview page.
+  setting_security_badge_displayed: Display security badge
+  setting_registration_footer: Registration footer
+  setting_registration_footer_caption: This text is displayed in the footer of the registration page. Use the HTML editor to format the text for each selected language.
+  setting_repositories_automatic_managed_vendor: Automatic repository vendor type
+  setting_repositories_encodings: Repositories encodings
+  setting_repository_storage_cache_minutes: Repository disk size cache
+  setting_repository_checkout_display: Show checkout instructions
+  setting_repository_checkout_base_url: Checkout base URL
+  setting_repository_checkout_text: Checkout instruction text
+  setting_repository_log_display_limit: Maximum number of revisions displayed on file log
+  setting_repository_truncate_at: Maximum number of files displayed in the repository browser
+  setting_self_registration: Self-registration
+  setting_self_registration_caption: 'Choose the self-registration mechanism for users. Be careful with the setting you choose, as some options allow users to activate their own accounts to this instance.
+
+    '
+  setting_self_registration_warning: 'The user will be able to activate their own accounts. Please note that this will give them access to all public projects and their content. Please make sure that no sensitive or private data is exposed in public projects.
+
+    '
+  setting_self_registration_disabled: Disabled
+  setting_self_registration_disabled_caption: 'No accounts can be registered on their own. Only administrators and users with the global permission to create new users are able to create new accounts.
+
+    '
+  setting_self_registration_activation_by_email: Account activation by email
+  setting_self_registration_activation_by_email_caption: 'Users can register on their own and activate their account after confirming their email address. Administrators have no moderation control over the activation process.
+
+    '
+  setting_self_registration_automatic_activation: Automatic account activation
+  setting_self_registration_automatic_activation_caption: 'Users can register on their own. Their accounts are immediately active without further action. Administrators have no moderation control over the activation process.
+
+    '
+  setting_self_registration_manual_activation: Manual account activation
+  setting_self_registration_manual_activation_caption: 'Users can register on their own. Their accounts are in a pending state until an administrator or user with the global permission to create or manage users activates them.
+
+    '
+  setting_session_ttl: Session expiration time after inactivity
+  setting_session_ttl_hint: Value below 5 works like disabled
+  setting_session_ttl_enabled: Session expires
+  setting_start_of_week: Week starts on
+  setting_sys_api_enabled: Enable repository management web service
+  setting_sys_api_description: The repository management web service provides integration and user authorization for accessing repositories.
+  setting_time_format: Time
+  setting_total_percent_complete_mode: Calculation of % Complete hierarchy totals
+  setting_total_percent_complete_mode_work_weighted_average: Weighted by work
+  setting_total_percent_complete_mode_work_weighted_average_caption_html: The <i>total % Complete</i> will be weighted against the <i>Work</i> of each work package in the hierarchy. Work packages without <i>Work</i> will be ignored.
+  setting_total_percent_complete_mode_simple_average: Simple average
+  setting_total_percent_complete_mode_simple_average_caption_html: "<i>Work</i> is ignored and the <i>total % Complete</i> will be a simple average of <i>% Complete</i> values of work packages in the hierarchy."
+  setting_accessibility_mode_for_anonymous: Enable accessibility mode for anonymous users
+  setting_user_format: Users name format
+  setting_user_default_timezone: Users default time zone
+  setting_users_deletable_by_admins: User accounts deletable by admins
+  setting_users_deletable_by_self: Users allowed to delete their accounts
+  setting_welcome_text: Welcome block text
+  setting_welcome_title: Welcome block title
+  setting_welcome_on_homescreen: Display welcome block on homescreen
+  setting_work_packages_identifier_classic: Instance-wide numerical sequence (default)
+  setting_work_packages_identifier_classic_caption: 'Every work package gets a sequential number starting with 1 and incremented with every new one. The numbers are unique within this instance so they remain the same even if work packages are moved between projects.
+
+    '
+  setting_work_packages_identifier_semantic: Project-based semantic identifiers
+  setting_work_packages_identifier_semantic_caption: 'Every project has a unique identifier that is prefixed to the work package ID. If a work package moved to another project, a new identifier is generated but the old one continues to function.
+
+    '
+  setting_work_package_list_default_highlighting_mode: Default highlighting mode
+  setting_work_package_list_default_highlighted_attributes: Default inline highlighted attributes
+  setting_working_days: Working days
+  settings:
+    errors:
+      not_writable: The setting is not writable and can only be changed by a sysadmin.
+      failed_to_update: 'Setting ''%{name}'' could not be updated: %{message}'
+    authentication:
+      login: Login
+      registration: Registration
+      sso: Single Sign-On (SSO)
+      omniauth_direct_login_hint_html: 'If this option is active, login requests will redirect to the configured omniauth provider. The login dropdown and sign-in page will be disabled. <br/> <strong>Note:</strong> Unless you also disable password logins, with this option enabled, users can still log in internally by visiting the <code>%{internal_path}</code> login page.
+
+        '
+      remapping_existing_users_hint: 'If enabled, allows any configured identity provider to login existing users based on their username, even if the user never signed in through that provider before. This can be useful when migrating the OpenProject instance to a new SSO provider, but is not recommended when using a provider that is not trusted by all users of your instance.
+
+        '
+    attachments:
+      whitelist_text_html: 'Define a list of valid file extensions and/or mime types for uploaded files. <br/> Enter file extensions (e.g., <code>%{ext_example}</code>) or mime types (e.g., <code>%{mime_example}</code>). <br/> Leave empty to allow any file type to be uploaded. Multiple values allowed (one line for each value).
+
+        '
+      show_work_package_attachments: 'Deactivating this option will hide the attachments list on the work packages files tab for new projects. The files attached in the description of a work package will still be uploaded in the internal attachments storage.
+
+        '
+    antivirus:
+      title: Virus scanning
+      clamav_ping_failed: Failed to connect the the ClamAV daemon. Double-check the configuration and try again.
+      remaining_quarantined_files_html: 'Virus scanning has been disbled. %{file_count} remain in quarantine. To review quarantined files, please visit this link: %{link}
+
+        '
+      remaining_scan_complete_html: 'Remaining files have been scanned. There are %{file_count} in quarantine. You are being redirected to the quarantine page. Use this page to delete or override quarantined files.
+
+        '
+      remaining_rescanned_files: 'Virus scanning has been enabled successfully. There are %{file_count} that were uploaded previously and still need to be scanned. This process has been scheduled in the background. The files will remain accessible during the scan.
+
+        '
+      actions:
+        delete: Delete the file
+        quarantine: Quarantine the file
+        instructions_html: 'Select the action to perform for files on which a virus has been detected: <br/> <ul> <li><strong>%{quarantine_option}</strong>: Quarantine the file, preventing users from accessing it. Administrators can review and delete quarantined files in the administration.</li> <li><strong>%{delete_option}</strong>: Delete the file immediately.</li> </ul>
+
+          '
+      modes:
+        clamav_socket_html: Enter the socket to the clamd daemon, e.g., %{example}
+        clamav_host_html: Enter the hostname and port to the clamd daemon separated by colon. e.g., %{example}
+        description_html: 'Select the mode in which the antivirus scanner integration should operate. <br/> <ul> <li><strong>%{disabled_option}</strong>: Uploaded files are not scanned for viruses.</li> <li><strong>%{socket_option}</strong>: You have set up ClamAV on the same server as OpenProject and the scan daemon clamd is running in the background</li> <li><strong>%{host_option}</strong>: You are streaming files to an external virus scanning host.</li> </ul>
+
+          '
+    brute_force_prevention: Automated user blocking
+    date_format:
+      first_date_of_week_and_year_set: 'If either options "%{day_of_week_setting_name}" or "%{first_week_setting_name}" are set, the other has to be set as well to avoid inconsistencies in the frontend.
+
+        '
+      first_week_of_year_text_html: 'Select the date of January that is contained in the first week of the year. This value together with first day of the week determines the total number of weeks in a year. For more information, please see our <a href="%{link}" target="_blank">documentation</a> on this topic.
+
+        '
+    experimental:
+      save_confirmation: Caution! Risk of data loss! Only activate experimental features if you do not mind breaking your OpenProject installation and losing all of its data.
+      warning_toast: Feature flags are settings that activate features that are still under development. They shall only be used for testing purposes. They shall never be activated on OpenProject installations holding important data. These features will very likely corrupt your data. Use them at your own risk.
+      feature_flags: Feature flags
+    general: General
+    highlighting:
+      mode_long:
+        inline: Highlight attribute(s) inline
+        none: No highlighting
+        status: Entire row by Status
+        type: Entire row by Type
+        priority: Entire row by Priority
+    icalendar:
+      enable_subscriptions_text_html: Allows users with the necessary permissions to subscribe to OpenProject calendars and access work package information via an external calendar client. <strong>Note:</strong> Please read about <a href="%{link}" target="_blank">iCalendar subscriptions</a> to understand potential security risks before enabling this.
+    language_name_being_default: "%{language_name} (default)"
+    notifications:
+      events_explanation: Governs for which event an email is sent out. Work packages are excluded from this list as the notifications for them can be configured specifically for every user.
+      delay_minutes_explanation: Email sending can be delayed to allow users with configured in app notification to confirm the notification within the application before a mail is sent out. Users who read a notification within the application will not receive an email for the already read notification.
+    other: Other
+    passwords: Passwords
+    project_attributes:
+      heading: Project attributes
+      label_for_all_projects: All projects
+      label_new_attribute: Project attribute
+      label_new_section: Section
+      label_edit_section: Edit title
+      label_section_actions: Section actions
+      heading_description: These project attributes appear in the overview page of each project. You can add new attributes, group them into sections and re-order them as you please. These attributes can be enabled or disabled but not re-ordered at a project level.
+      label_project_custom_field_actions: Project attribute actions
+      label_no_project_custom_fields: No project attributes defined in this section
+      edit:
+        description: Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis.
+      new:
+        heading: New attribute
+        description: Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis.
+      sections:
+        display_representation:
+          overview:
+            label: 'Project attribute shown in:'
+            main_area:
+              label: Main area
+              description: Add all the project attributes as individual widgets in the main section of the project overview.
+            side_panel:
+              label: Side panel
+              description: Add all the project attributes in a section inside the right side panel in the project overview.
+    project_initiation_request:
+      header_description: 'OpenProject can generate a step-by-step wizard to help project managers fill out a project initiation request. You can choose which project attributes should be included and create a PDF artifact as a result.
+
+        '
+      status:
+        submitted: "%{wizard_name} has been submitted"
+        submitted_description: Click the button below to go to the work package for the submission process.
+        submitted_button: Open submission request
+        not_completed: "%{wizard_name} not yet completed"
+        not_completed_description: Provide the necessary information by filling the attributes and get the project started.
+      wizard_status_button:
+        project_initiation_request: Open project initiation request
+        project_creation_wizard: Open project creation wizard
+        project_mandate: Open project mandate
+      blankslate:
+        title: Initiation request not enabled
+        description: OpenProject can generate a step-by-step wizard to help project managers fill out a project initiation request. You can choose which project attributes should be included and what to do with the output document. Enable it here to start configuring the wizard.
+      disable_dialog:
+        title: Disable project initiation request
+        heading: Disable this project initiation request?
+        confirmation_message: The initiation request wizard will no longer be available to new projects based on this template. Project managers and project owners will need to manually configure and fill out the relevant information in the Project overview.
+        checkbox_message: I understand that this action is not reversible
+      name:
+        artifact_name: Artifact name
+        artifact_name_caption: Choose the name for this artifact that your project management framework recommends.
+        options:
+          project_initiation_request: Project initiation request
+          project_creation_wizard: Project creation wizard
+          project_mandate: Project mandate
+      submission:
+        description_template: "**This work package was automatically created upon completion of the %{wizard_name} workflow.** A PDF artifact containing all submitted information has been generated and attached to this work package for reference and audit purposes. If you need to update or re-run the initiation steps, you can reopen the wizard at any time by using the link below:\n"
+        description: When a user submits a project initiation request, a new work package will be created with the request artifact attached as a PDF file. The settings below define the type, status and assignee for this new work package.
+        work_package_type: Work package type
+        work_package_type_caption: The work package type that should be used to store the completed artifact.
+        status_when_submitted: Status when submitted
+        status_when_submitted_caption: The status the generated work package will transition to once the request is submitted.
+        send_confirmation_email: Send confirmation email to the user who submitted the project initiation request
+        assignee: Assignee when submitted
+        assignee_caption_html: The user or group assigned to this project attribute will also become the assignee of the new work package. This list includes active project attributes of type <i>User</i> only.
+        confirmation_email_text: Confirmation email text
+        confirmation_email_default: |-
+          Hello,
+
+          You submitted a project initiation request for **%{project_name}**. It is now awaiting review.
+          Click the link below to access the work package with your request.
+        work_package_comment: Work package comment
+        work_package_comment_caption: The assignee selected above will automatically be @mentioned in the comment.
+        work_package_comment_default: A project initiation request for **%{project_name}** was submitted and is awaiting review.
+    project_phase_definitions:
+      heading: Project life cycle
+      heading_description: Project life cycle defines the project phases that can be used for your project planning and will appear in the overview page of each project. These attributes can be enabled or disabled but not re-ordered at a project level.
+      label_add: Add
+      label_add_description: Add project phase definition
+      filter:
+        label: Search project phase
+      section_header: Phases
+      non_defined: No phases are currently defined.
+      phase_gates: Phase gates
+      new:
+        description: Changes to this project phase will be reflected in all projects where it is enabled.
+        heading: New phase
+      both_gate: Start and finish gate
+      no_gate: No gate
+      start_gate: Start gate
+      start_gate_caption: Add a gate with the start date of the phase
+      finish_gate: Finish gate
+      finish_gate_caption: Add a gate with the end date of the phase
+    projects:
+      missing_dependencies: Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well.
+      section_new_projects: Settings for new projects
+      section_project_overview: Settings for project lists
+    session: Session
+    user:
+      default_preferences: Default preferences
+      display_format: Display format
+      deletion: Deletion
+    working_days:
+      section_work_week: Work week
+      section_holidays_and_closures: Holidays and closures
+    work_packages:
+      work_package_identifier: Work package identifier
+      not_allowed_text: You do not have the necessary permissions to view this page.
+      activities:
+        enable_internal_comments: Enable internal comments
+        helper_text_html: 'Internal comments allow an internal team to communicate amongst themselves privately. These are only visible to selected roles that have the necessary permissions and will not be visible publicly. [Click here to learn more](docs_url)
+
+          '
+  text_formatting:
+    markdown: Markdown
+    plain: Plain text
+  status_active: active
+  status_archived: archived
+  status_blocked: blocked
+  status_invited: invited
+  status_locked: locked
+  status_registered: registered
+  status_deleted: deleted
+  support:
+    array:
+      sentence_connector: and
+      skip_last_comma: 'false'
+  text_accessibility_hint: The accessibility mode is designed for users who are blind, motorically handicaped or have a bad eyesight. For the latter focused elements are specially highlighted. Please notice, that the Backlogs module is not available in this mode.
+  text_access_token_hint: Access tokens allow you to grant external applications access to resources in OpenProject.
+  text_analyze: 'Further analyze: %{subject}'
+  text_are_you_sure: Are you sure?
+  open_link_in_a_new_tab: Open link in a new tab
+  text_are_you_sure_continue: Are you sure you want to continue?
+  text_are_you_sure_with_children: Delete work package and all child work packages?
+  text_are_you_sure_with_project_custom_fields: Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?
+  text_are_you_sure_with_project_life_cycle_step: Deleting this phase will also delete its usages in all projects. Are you sure you want to do this?
+  text_assign_to_project: Assign to the project
+  text_form_configuration: 'You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain.
+
+    '
+  text_form_configuration_required_attribute: Attribute is marked required and thus always shown
+  text_caracters_maximum: "%{count} characters maximum."
+  text_caracters_minimum: Must be at least %{count} characters long.
+  text_comma_separated: Multiple values allowed (comma separated).
+  text_comment_wiki_page: 'Comment to wiki page: %{page}'
+  text_custom_field_possible_values_info: One line for each value
+  text_custom_field_hint_activate_per_project: 'When using custom fields: Keep in mind that custom fields need to be activated per project, too.
+
+    '
+  text_custom_field_hint_activate_per_project_and_type: 'Custom fields need to be activated per work package type and per project.
+
+    '
+  text_project_custom_field_html: 'The Enterprise edition will add these additional add-ons for projects'' custom fields: <br> <ul> <li><b>Add custom fields for projects to your Project list to create a project portfolio view</b></li> </ul>
+
+    '
+  text_custom_logo_instructions: 'The logo automatically scales to fit the header. For best results, upload a white logo on a transparent 130×47px image. You can add as much spacing inside that image as you like.
+
+    '
+  text_custom_logo_mobile_instructions: 'The logo automatically scales to fit the header. For best results, upload a white logo on a transparent 130×33px image. You can add as much spacing inside that image as you like.
+
+    '
+  text_custom_export_logo_instructions: 'This is the logo that appears in your PDF exports. It needs to be a PNG or JPEG image file. A black or colored logo on transparent or white background is recommended.
+
+    '
+  text_custom_export_cover_instructions: 'This is the image that appears in the background of a cover page in your PDF exports. It needs to be an about 800px width by 500px height sized PNG or JPEG image file.
+
+    '
+  text_custom_export_footer_instructions: 'PDF exports will include a graphical element positioned to the left of the footer. This image must be a PNG or JPEG file with approximately 200 pixels in width.
+
+    '
+  label_custom_export_font_instructions: 'Upload and manage custom TrueType (.ttf) fonts used in your PDF exports. For best results, use matching files from the same font family. If no font is provided, the default NotoSans font will be used.
+
+    '
+  label_custom_export_images_instructions: 'Upload and manage custom image files used in your PDF exports.
+
+    '
+  text_custom_export_font_regular_instructions: 'This is the font file for regular text. It needs to be in TTF format and is required.
+
+    '
+  text_custom_export_font_bold_instructions: 'This is the font file for bold text. It needs to be in TTF format.
+
+    '
+  text_custom_export_font_italic_instructions: 'This is the font file for italic text. It needs to be in TTF format.
+
+    '
+  text_custom_export_font_bold_italic_instructions: 'This is the font file for bold and italic text. It needs to be in TTF format.
+
+    '
+  text_custom_favicon_instructions: 'This is the tiny icon that appears in your browser window/tab next to the page''s title. It needs to be a squared 32 by 32 pixels sized PNG image file with a transparent background.
+
+    '
+  text_custom_touch_icon_instructions: 'This is the icon that appears in your mobile or tablet when you place a bookmark on your homescreen. It needs to be a squared 180 by 180 pixels sized PNG image file. Please make sure the image''s background is not transparent otherwise it will look bad on iOS.
+
+    '
+  text_database_allows_tsv: Database allows TSVector (optional)
+  text_default_administrator_account_changed: Default administrator account changed
+  text_default_encoding: 'Default: UTF-8'
+  text_destroy: Delete
+  text_destroy_with_associated: 'There are additional objects associated with the work package(s) that are to be deleted. Those objects are of the following types:'
+  text_destroy_what_to_do: What do you want to do?
+  text_diff_truncated: "... This diff was truncated because it exceeds the maximum size that can be displayed."
+  text_email_delivery_not_configured: |-
+    Email delivery is not configured, and notifications are disabled.
+    Configure your SMTP server to enable them.
+  text_enumeration_category_reassign_to: 'Reassign them to this value:'
+  text_enumeration_destroy_question: "%{count} objects are assigned to this value."
+  text_file_repository_writable: Attachments directory writable
+  text_git_repo_example: a bare and local repository (e.g. /gitrepo, c:\gitrepo)
+  text_hint_date_format: Enter a date in the form of YYYY-MM-DD. Other formats may be changed to an unwanted date.
+  text_hint_disable_with_0: 'Note: Disable with 0'
+  text_hours_between: Between %{min} and %{max} hours.
+  text_work_package_added: Work package %{id} has been reported by %{author}.
+  text_work_package_category_destroy_assignments: Remove category assignments
+  text_work_package_category_destroy_question: Some work packages (%{count}) are assigned to this category. What do you want to do?
+  text_work_package_category_reassign_to: Reassign work packages to this category
+  text_work_package_updated: Work package %{id} has been updated by %{author}.
+  text_work_package_watcher_added: You have been added as a watcher to Work package %{id} by %{watcher_changer}.
+  text_work_package_watcher_removed: You have been removed from watchers of Work package %{id} by %{watcher_changer}.
+  text_work_packages_destroy_confirmation: Are you sure you want to delete the selected work package(s)?
+  text_work_packages_ref_in_commit_messages: Referencing and fixing work packages in commit messages
+  text_journal_added: "%{label} %{value} added"
+  text_journal_attachment_added: "%{label} %{value} added as attachment"
+  text_journal_attachment_deleted: "%{label} %{old} removed as attachment"
+  text_journal_changed_plain: "%{label} changed from %{old} %{linebreak}to %{new}"
+  text_journal_changed_no_detail: "%{label} updated"
+  text_journal_changed_with_diff: "%{label} changed (%{link})"
+  text_journal_deleted: "%{label} deleted (%{old})"
+  text_journal_deleted_subproject: "%{label} %{old}"
+  text_journal_deleted_with_diff: "%{label} deleted (%{link})"
+  text_journal_file_link_added: "%{label} link to %{value} (%{storage}) added"
+  text_journal_file_link_deleted: "%{label} link to %{old} (%{storage}) removed"
+  text_journal_of: "%{label} %{value}"
+  text_journal_set_to: "%{label} set to %{value}"
+  text_journal_set_with_diff: "%{label} set (%{link})"
+  text_journal_label_value: "%{label} %{value}"
+  text_latest_note: 'The latest comment is: %{note}'
+  text_length_between: Length between %{min} and %{max} characters.
+  text_line_separated: Multiple values allowed (one line for each value).
+  text_load_default_configuration: Load the default configuration
+  text_no_roles_defined: There are no roles defined.
+  text_no_access_tokens_configurable: There are no access tokens which can be configured.
+  text_no_configuration_data: |-
+    Roles, types, work package statuses and workflow have not been configured yet.
+    It is highly recommended to load the default configuration. You will be able to modify it once loaded.
+  text_no_notes: There are no comments available for this work package.
+  text_notice_too_many_values_are_inperformant: 'Note: Displaying more than 100 items per page can increase the page load time.'
+  text_notice_security_badge_displayed_html: 'Note: if enabled, this will display a badge with your installation status in the <a href="%{information_panel_path}">%{information_panel_label}</a> administration panel, and on the home page. It is displayed to administrators only. <br/> The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit <a href="%{more_info_url}">the configuration documentation</a>.
+
+    '
+  text_own_membership_delete_confirmation: |-
+    You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+    Are you sure you want to continue?
+  text_permanent_delete_confirmation_checkbox_label: I understand that this deletion cannot be reversed
+  text_permanent_remove_confirmation_checkbox_label: I understand that this removal cannot be reversed
+  text_plugin_assets_writable: Plugin assets directory writable
+  text_powered_by: Powered by %{link}
+  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.
+  text_project_identifier_description: The project identifier is prepended to all work package IDs. If the identifier is "PROJ" for example, the work package identifier will be "PROJ-12" or "PROJ-246".
+  text_project_identifier_url_description: The project identifier is included in the URL of the project.
+  text_project_identifier_handle_format: Must start with a letter and contain only uppercase letters, numbers, and underscores (max 10 characters).
+  text_project_identifier_format: Must start with a lowercase letter. Only lowercase letters (a-z), numbers, dashes and underscores are allowed.
+  text_reassign: 'Reassign to work package:'
+  text_regexp_multiline: The regex is applied in a multi-line mode. e.g., ^---\s+
+  text_rename_wiki_page: Rename wiki page
+  text_repository_usernames_mapping: |-
+    Select or update the OpenProject user mapped to each username found in the repository log.
+    Users with the same OpenProject and repository username or email are automatically mapped.
+  text_status_changed_by_changeset: Applied in changeset %{value}.
+  text_table_difference_description: In this table the single %{entries} are shown. You can view the difference between any two entries by first selecting the according checkboxes in the table. When clicking on the button below the table the differences are shown.
+  text_time_logged_by_changeset: Applied in changeset %{value}.
+  text_tip_work_package_begin_day: work package beginning this day
+  text_tip_work_package_begin_end_day: work package beginning and ending this day
+  text_tip_work_package_end_day: work package ending this day
+  text_type_no_workflow: No workflow defined for this type
+  text_unallowed_characters: Unallowed characters
+  text_user_invited: The user has been invited and is pending registration.
+  text_user_wrote: "%{value} wrote:"
+  text_wrote: wrote
+  text_warn_on_leaving_unsaved: The work package contains unsaved text that will be lost if you leave this page.
+  text_what_did_you_change_click_to_add_comment: What did you change? Click to add comment
+  text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content?
+  text_wiki_page_destroy_children: Delete child pages and all their descendants
+  text_wiki_page_destroy_question: This page has %{descendants} child page(s) and descendant(s). What do you want to do?
+  text_wiki_page_nullify_children: Keep child pages as root pages
+  text_wiki_page_reassign_children: Reassign child pages to this parent page
+  text_workflow_edit: Select a role and a type to edit the workflow
+  text_zoom_in: Zoom in
+  text_zoom_out: Zoom out
+  text_setup_mail_configuration: Configure your email provider
+  help_texts:
+    views:
+      project: "%{plural} are always attached to a project. You can only select projects here where the %{plural} module is active. After creating a %{singular} you can add work packages from other projects to it.\n"
+      public: Publish this view, allowing other users to access your view. Users with the 'Manage public views' permission can modify or remove public query. This does not affect the visibility of work package results in that view and depending on their permissions, users may see different results.
+      favoured: Mark this view as favourite and add to the saved views sidebar on the left.
+  time:
+    am: am
+    formats:
+      default: "%m/%d/%Y %I:%M %p"
+      long: "%B %d, %Y %H:%M"
+      short: "%d %b %H:%M"
+      time: "%I:%M %p"
+    pm: pm
+  timeframe:
+    show: Show timeframe
+    end: to
+    start: from
+  title_remove_and_delete_user: Remove the invited user from the project and delete him/her.
+  title_enterprise_upgrade: Upgrade to unlock more users.
+  tooltip_user_default_timezone: 'The default time zone for new users. Can be changed in a user''s settings.
+
+    '
+  tooltip_resend_invitation: 'Sends another invitation email with a fresh token in case the old one expired or the user did not get the original email. Can also be used for active users to choose a new authentication method. When used with active users their status will be changed to ''invited''.
+
+    '
+  tooltip:
+    setting_email_login: 'If enabled a user will be unable to chose a login during registration. Instead their given email address will serve as the login. An administrator may still change the login separately.
+
+      '
+  queries:
+    apply_filter: Apply preconfigured filter
+    configure_view:
+      heading: Configure view
+      columns:
+        input_label: Add columns
+        input_placeholder: Select a column
+        drag_area_label: Manage and reorder columns
+      sort_by:
+        automatic:
+          heading: Automatic
+          description: Order the %{plural} by one or more sorting criteria. You will lose the previous sorting.
+  top_menu:
+    additional_resources: Additional resources
+    getting_started: Getting started
+    help_and_support: Help and support
+  total_progress: Total progress
+  user:
+    all: all
+    active: active
+    activate: Activate
+    activate_and_reset_failed_logins: Activate and reset failed logins
+    authentication_provider: Authentication Provider
+    identity_url_text: The internal unique identifier provided by the authentication provider.
+    authentication_settings_disabled_due_to_external_authentication: 'This user authenticates via an external authentication provider, so there is no password in OpenProject to be changed.
+
+      '
+    authorization_rejected: You are not allowed to sign in.
+    assign_random_password: Assign random password (sent to user via email)
+    blocked: locked temporarily
+    blocked_num_failed_logins:
+      one: locked temporarily (one failed login attempt)
+      other: locked temporarily (%{count} failed login attempts)
+    confirm_status_change: You are about to change the status of '%{name}'. Are you sure you want to continue?
+    deleted: Deleted user
+    error_status_change_self: You cannot change your own user status.
+    error_admin_change_on_non_admin: Only administrators can change the status of administrator users.
+    error_status_change_failed: 'Changing the user status failed due to the following errors: %{errors}'
+    invite: Invite user via email
+    invited: invited
+    lock: Lock permanently
+    locked: locked permanently
+    no_login: This user authenticates through login by password. Since it is disabled, they cannot log in.
+    password_change_unsupported: Change of password is not supported.
+    registered: registered
+    reset_failed_logins: Reset failed logins
+    status_user_and_brute_force: "%{user} and %{brute_force}"
+    status_change: Status change
+    text_change_disabled_for_provider_login: The name and email is set by your login provider and can thus not be changed.
+    unlock: Unlock
+    unlock_and_reset_failed_logins: Unlock and reset failed logins
+    error_cannot_delete_user: User cannot be deleted
+  version_status_closed: closed
+  version_status_locked: locked
+  version_status_open: open
+  note: Note
+  note_password_login_disabled_link: Password login has been disabled through a [configuration setting](configuration_url).
+  warning: Warning
+  warning_attachments_not_saved: "%{count} file(s) could not be saved."
+  warning_imminent_user_limit_html: 'You invited more users than are supported by your current plan. Invited users may not be able to join your OpenProject environment. Please [upgrade your plan](upgrade_url) or block existing users in order to allow invited and registered users to join.
+
+    '
+  warning_registration_token_expired: |
+    The activation email has expired. We sent you a new one to %{email}.
+    Please click the link inside of it to activate your account.
+  warning_user_limit_reached: 'Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this instance.
+
+    '
+  warning_user_limit_reached_admin_html: 'Adding additional users will exceed the current limit. Please [upgrade your plan](upgrade_url) to be able to ensure external users are able to access this instance.
+
+    '
+  warning_user_limit_reached_instructions: 'You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise edition plan and add additional users.
+
+    '
+  warning_protocol_mismatch_html: ''
+  warning_bar:
+    https_mismatch:
+      title: HTTPS mode setup mismatch
+      text_html: 'Your application is running with HTTPS mode set to <code>%{set_protocol}</code>, but the request is an <code>%{actual_protocol}</code> request. This will result in errors! You will need to set the following configuration value: <code>%{setting_value}</code>. Please see <a href="%{more_info_path}">the installation documentation</a> on how to set this configuration.
+
+        '
+    hostname_mismatch:
+      title: Hostname setting mismatch
+      text_html: 'Your application is running with its host name setting set to <code>%{set_hostname}</code>, but the request is a <code>%{actual_hostname}</code> hostname. This will result in errors! Go to <a href="%{setting_path}">System settings</a> and change the "Host name" setting to correct this.
+
+        '
+  menu_item: Menu item
+  menu_item_setting: Visibility
+  wiki_menu_item_for: Menu item for wikipage "%{title}"
+  wiki_menu_item_setting: Visibility
+  wiki_menu_item_new_main_item_explanation: 'You are deleting the only main wiki menu item. You now have to choose a wiki page for which a new main item will be generated. To delete the wiki the wiki module can be deactivated by project administrators.
+
+    '
+  wiki_menu_item_delete_not_permitted: The wiki menu item of the only wiki page cannot be deleted.
+  work_package:
+    updated_automatically_by_child_changes: '_Updated automatically by changing values within child work package %{child}_
+
+      '
+    destroy:
+      info: Deleting the work package is an irreversible action.
+      title: Delete the work package
+    progress:
+      label_note: 'Note:'
+      modal:
+        work_based_help_text: Each field is automatically calculated from the two others when possible.
+        status_based_help_text: "% Complete is set by work package status."
+        migration_warning_text: In work-based progress calculation mode, % Complete cannot be manually set and is tied to Work. The existing value has been kept but cannot be edited. Please input Work first.
+      derivation_hints:
+        done_ratio:
+          cleared_because_remaining_work_is_empty: Cleared because Remaining work is empty.
+          cleared_because_work_is_0h: Cleared because Work is 0h.
+          derived: Derived from Work and Remaining work.
+        estimated_hours:
+          cleared_because_remaining_work_is_empty: Cleared because Remaining work is empty.
+          derived: Derived from Remaining work and % Complete.
+          same_as_remaining_work: Set to same value as Remaining work.
+        remaining_hours:
+          cleared_because_work_is_empty: Cleared because Work is empty.
+          cleared_because_percent_complete_is_empty: Cleared because % Complete is empty.
+          decreased_by_delta_like_work: Decreased by %{delta}, matching the reduction in Work.
+          derived: Derived from Work and % Complete.
+          increased_by_delta_like_work: Increased by %{delta}, matching the increase in Work.
+          same_as_work: Set to same value as Work.
+    permissions:
+      comment: Comment
+      comment_verb: comment
+      comment_description: Can view and comment this work package.
+      edit: Edit
+      edit_verb: edit
+      edit_description: Can view, comment and edit this work package.
+      view: View
+      view_verb: view
+      view_description: Can view this work package.
+    reminders:
+      label_remind_at: Date
+      note_placeholder: Why are you setting this reminder?
+      create_success_message_html: Reminder set successfully. You will receive a notification for this work package %{reminder_time}.
+      success_update_message: Reminder updated successfully.
+      success_deletion_message: Reminder deleted successfully.
+  sharing:
+    count:
+      zero: 0 users
+      one: 1 user
+      other: "%{count} users"
+    filter:
+      project_member: Project member
+      not_project_member: Not project member
+      project_group: Project group
+      not_project_group: Not project group
+      user: User
+      group: Group
+      role: Role
+      type: Type
+    denied: You don't have permissions to share %{entities}.
+    label_search: Search for users to invite
+    label_search_placeholder: Search by user or email address
+    label_toggle_all: Toggle all shares
+    remove: Remove
+    share: Share
+    text_empty_search_description: There are no users with the current filter criteria.
+    text_empty_search_header: We couldn't find any matching results.
+    text_empty_state_description: The %{entity} has not been shared with anyone yet.
+    text_empty_state_header: Not shared
+    text_user_limit_reached: Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}.
+    text_user_limit_reached_admins: Adding additional users will exceed the current limit. Please <a href="%{upgrade_url}">upgrade your plan</a> to be able to add more users.
+    warning_user_limit_reached: 'Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}.
+
+      '
+    warning_user_limit_reached_admin_html: 'Adding additional users will exceed the current limit. Please [upgrade your plan](upgrade_url) to be able to ensure external users are able to access this %{entity}.
+
+      '
+    warning_no_selected_user: Please select users to share this %{entity} with
+    warning_locked_user: The user %{user} is locked and cannot be shared with
+    user_details:
+      locked: Locked user
+      invited: 'Invite sent. '
+      resend_invite: Resend.
+      invite_resent: Invite has been resent
+      not_project_member: Not a project member
+      project_group: Group members might have additional privileges (as project members)
+      not_project_group: Group (shared with all members)
+      additional_privileges_project: Might have additional privileges (as project member)
+      additional_privileges_group: Might have additional privileges (as group member)
+      additional_privileges_project_or_group: Might have additional privileges (as project or group member)
+    project_queries:
+      publishing_denied: You do not have permission to make project lists public.
+      access_warning: Users will only see the projects they have access to. Sharing project lists does not impact individual project permissions.
+      user_details:
+        owner: List owner
+        can_view_because_public: Can already view because list is shared with everyone
+        can_manage_public_lists: Can edit due to global permissions
+      public_flag:
+        label: Share with everyone at %{instance_name}
+        caption: Everyone can view this project list. Those with global edit permissions can modify it.
+      blank_state:
+        public:
+          header: Shared with everyone
+          description: Everyone can view this project list. You can also add individual users with extra permissions.
+        private:
+          header: 'Not shared: Private'
+          description: This project list has not been shared with anyone yet. Only you can access this list.
+      permissions:
+        view: View
+        view_description: Can view this project list.
+        edit: Edit
+        edit_description: Can view, share and edit this project list.
+      upsell:
+        message: Sharing project lists with individual users is an enterprise add-on.
+  working_days:
+    info: 'Days that are not selected are skipped when scheduling work packages and project life cycles (and not included in the day count). These can be overridden at a work-package level.
+
+      '
+    instance_wide_info: 'Dates added to the list below are considered non-working and skipped when scheduling work packages.
+
+      '
+    change_button: Change working days
+    warning: 'Changing which days of the week are considered working days or non-working days can affect the start and finish days of all work packages and life cycles in all projects in this instance.
+
+      '
+    journal_note:
+      changed: _**Working days** changed (%{changes})._
+      days:
+        working: "%{day} is now working"
+        non_working: "%{day} is now non-working"
+      dates:
+        working: "%{date} is now working"
+        non_working: "%{date} is now non-working"
+  nothing_to_preview: Nothing to preview
+  api_v3:
+    attributes:
+      property: Property
+    errors:
+      code_400: 'Bad request: %{message}'
+      code_401: You need to be authenticated to access this resource.
+      code_401_wrong_credentials: You did not provide the correct credentials.
+      code_403: You are not authorized to access this resource.
+      code_404: The requested resource could not be found.
+      code_409: Could not update the resource because of conflicting modifications.
+      code_429: Too many requests. Please try again later.
+      code_500: An internal error has occurred.
+      code_500_outbound_request_failure: An outbound request to another resource has failed with status code %{status_code}.
+      code_500_missing_enterprise_token: The request can not be handled due to invalid or missing Enterprise token.
+      bad_request:
+        emoji_reactions_activity_type_not_supported: This activity type does not support emoji reactions.
+        invalid_link: The link under key '%{key}' is not valid.
+        links_not_an_object: _links must be a JSON object.
+      conflict:
+        multiple_reminders_not_allowed: You can only set one reminder at a time for a work package. Please delete or update the existing reminder.
+      not_found:
+        work_package: The work package you are looking for cannot be found or has been deleted.
+        reminder: The reminder you are looking for cannot be found or has been deleted.
+      expected:
+        date: YYYY-MM-DD (ISO 8601 date only)
+        datetime: YYYY-MM-DDThh:mm:ss[.lll][+hh:mm] (any compatible ISO 8601 datetime)
+        duration: ISO 8601 duration
+      invalid_content_type: Expected CONTENT-TYPE to be '%{content_type}' but got '%{actual}'.
+      invalid_format: 'Invalid format for property ''%{property}'': Expected format like ''%{expected_format}'', but got ''%{actual}''.'
+      invalid_json: The request could not be parsed as JSON.
+      invalid_relation: The relation is invalid.
+      invalid_resource: For property '%{property}' a link like '%{expected}' is expected, but got '%{actual}'.
+      invalid_signal:
+        embed: The requested embedding of %{invalid} is not supported. Supported embeddings are %{supported}.
+        select: The requested select of %{invalid} is not supported. Supported selects are %{supported}.
+      invalid_user_status_transition: The current user account status does not allow this operation.
+      missing_content_type: not specified
+      missing_property: Missing property '%{property}'.
+      missing_request_body: There was no request body.
+      missing_or_malformed_parameter: The query parameter '%{parameter}' is missing or malformed.
+      multipart_body_error: The request body did not contain the expected multipart parts.
+      multiple_errors: Multiple field constraints have been violated.
+      unable_to_create_attachment: The attachment could not be created
+      unable_to_create_attachment_permissions: The attachment could not be saved due to lacking file system permissions
+      user:
+        name_readonly: The name attribute is read-only. Changes can be written through the attributes firstname and lastname.
+      render:
+        context_not_parsable: The context provided is not a link to a resource.
+        unsupported_context: The resource given is not supported as context.
+        context_object_not_found: Cannot find the resource given as the context.
+      validation:
+        due_date: Finish date cannot be set on parent work packages.
+        invalid_user_assigned_to_work_package: The chosen user is not allowed to be '%{property}' for this work package.
+        start_date: Start date cannot be set on parent work packages.
+      eprops:
+        invalid_gzip: 'is invalid gzip: %{message}'
+        invalid_json: 'is invalid json: %{message}'
+    resources:
+      schema: Schema
+    undisclosed:
+      parent: Undisclosed - The parent is invisible because of lacking permissions.
+      project: Undisclosed - The project is invisible because of lacking permissions.
+      ancestor: Undisclosed - The ancestor is invisible because of lacking permissions.
+      definingProject: Undisclosed - The project is invisible because of lacking permissions.
+      definingWorkspace: Undisclosed - The workspace is invisible because of lacking permissions.
+  doorkeeper:
+    pre_authorization:
+      status: Pre-authorization
+    auth_url: Auth URL
+    access_token_url: Access token URL
+    errors:
+      messages:
+        invalid_request:
+          unknown: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
+          missing_param: 'Missing required parameter: %{value}.'
+          request_not_authorized: Request need to be authorized. Required parameter for authorizing request is missing or invalid.
+        invalid_redirect_uri: The requested redirect uri is malformed or doesn't match client redirect URI.
+        unauthorized_client: The client is not authorized to perform this request using this method.
+        access_denied: The resource owner or authorization server denied the request.
+        invalid_scope: The requested scope is invalid, unknown, or malformed.
+        invalid_code_challenge_method: The code challenge method must be plain or S256.
+        server_error: The authorization server encountered an unexpected condition which prevented it from fulfilling the request.
+        temporarily_unavailable: The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.
+        credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
+        resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfigured.
+        admin_authenticator_not_configured: Access to admin panel is forbidden due to Doorkeeper.configure.admin_authenticator being unconfigured.
+        unsupported_response_type: The authorization server does not support this response type.
+        unsupported_response_mode: The authorization server does not support this response mode.
+        invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
+        invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
+        unsupported_grant_type: The authorization grant type is not supported by the authorization server.
+        invalid_token:
+          revoked: The access token was revoked
+          expired: The access token expired
+          unknown: The access token is invalid
+        revoke:
+          unauthorized: You are not authorized to revoke this token.
+        forbidden_token:
+          missing_scope: Access to this resource requires scope "%{oauth_scopes}".
+  unsupported_browser:
+    title: Your browser is outdated and unsupported.
+    message: You may run into errors and degraded experience on this page.
+    update_message: Please update your browser.
+    close_warning: Ignore this warning.
+  oauth:
+    application:
+      builtin: Built-in instance application
+      confidential: Confidential
+      singular: OAuth application
+      scopes: Scopes
+      client_credentials: Client credentials
+      plural: OAuth applications
+      named: OAuth application '%{name}'
+      new: New OAuth application
+      non_confidential: Non confidential
+      default_scopes: "(Default scopes)"
+      instructions:
+        enabled: Enable this application, allowing users to perform authorization grants with it.
+        name: The name of your application. This will be displayed to other users upon authorization.
+        redirect_uri_html: 'The allowed URLs authorized users can be redirected to. One entry per line. <br/> If you''re registering a desktop application, use the following URL.
+
+          '
+        confidential: Check if the application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are assumed non-confidential.
+        scopes: Check the scopes you want the application to grant access to. If no scope is checked, api_v3 is assumed.
+        client_credential_user_id: Optional user ID to impersonate when clients use this application. Leave empty to allow public access only
+        register_intro: If you are developing an OAuth API client application for OpenProject, you can register it using this form for all users to use.
+        default_scopes: ''
+    header:
+      builtin_applications: Built-in OAuth applications
+      other_applications: Other OAuth applications
+    empty_application_lists: No OAuth applications have been registered.
+    client_id: Client ID
+    client_secret_notice: 'This is the only time we can print the client secret, please note it down and keep it secure. It should be treated as a password and cannot be retrieved by OpenProject at a later time.
+
+      '
+    authorization_dialog:
+      authorize: Authorize
+      cancel: Cancel and deny authorization.
+      prompt_html: Authorize <strong>%{application_name}</strong> to use your account <em>%{login}</em>?
+      title: Authorize %{application_name}
+      wants_to_access_html: 'This application requests access to your OpenProject account. <br/> <strong>It has requested the following permissions:</strong>
+
+        '
+    scopes:
+      api_v3: Full API v3 access
+      api_v3_text: Application will receive full read & write access to the OpenProject API v3 to perform actions on your behalf.
+    grants:
+      created_date: Approved on
+      scopes: Permissions
+      successful_application_revocation: Revocation of application %{application_name} successful.
+      none_given: No OAuth applications have been granted access to your user account.
+    flows:
+      authorization_code: Authorization code flow
+      client_credentials: Client credentials flow
+    client_credentials: User used for Client credentials
+    client_credentials_impersonation_set_to: Client credentials user set to
+    client_credentials_impersonation_warning: 'Note: Clients using the ''Client credentials'' flow in this application will have the rights of this user'
+    client_credentials_impersonation_html: 'By default, OpenProject provides OAuth 2.0 authorization via %{authorization_code_flow_link}. You can optionally enable %{client_credentials_flow_link}, but you must provide a user on whose behalf requests will be performed.
+
+      '
+    confirm_revoke_my_application:
+      one: Do you really want to remove this application? This will revoke one token active for it.
+      other: Do you really want to remove this application? This will revoke %{count} tokens active for it.
+    authorization_error: An authorization error has occurred.
+    my_registered_applications: Registered OAuth applications
+  oauth_client:
+    urn_connection_status:
+      connected: Connected
+      error: Error
+      failed_authorization: Authorization failed
+      not_connected: Not connected
+    labels:
+      label_oauth_integration: OAuth2 integration
+      label_redirect_uri: Redirect URI
+      label_request_token: Request token
+      label_refresh_token: Refresh token
+    errors:
+      oauth_authorization_code_grant_had_errors: OAuth2 Authorization grant unsuccessful
+      oauth_reported: OAuth2 provider reported
+      oauth_returned_error: OAuth2 returned an error
+      oauth_returned_json_error: OAuth2 returned a JSON error
+      oauth_returned_http_error: OAuth2 returned a network error
+      oauth_returned_standard_error: OAuth2 returned an internal error
+      wrong_token_type_returned: OAuth2 returned a wrong type of token, expecting AccessToken::Bearer
+      oauth_issue_contact_admin: OAuth2 reported an error. Please contact your system administrator.
+      oauth_client_not_found: OAuth2 client not found in 'callback' endpoint (redirect_uri).
+      refresh_token_called_without_existing_token: 'Internal error: Called refresh_token without a previously existing token.
+
+        '
+      refresh_token_updated_failed: Error during update of OAuthClientToken
+      oauth_client_not_found_explanation: 'This error appears after you have updated the client_id and client_secret in OpenProject, but haven''t updated the ''Return URI'' field in the OAuth2 provider.
+
+        '
+      oauth_code_not_present: OAuth2 'code' not found in 'callback' endpoint (redirect_uri).
+      oauth_code_not_present_explanation: 'This error appears if you have selected the wrong response_type in the OAuth2 provider. Response_type should be ''code'' or similar.
+
+        '
+      oauth_state_not_present: OAuth2 'state' not found in 'callback' endpoint (redirect_uri).
+      oauth_state_not_present_explanation: 'The ''state'' is used to indicate to OpenProject where to continue after a successful OAuth2 authorization. A missing ''state'' is an internal error that may appear during setup. Please contact your system administrator.
+
+        '
+      rack_oauth2:
+        client_secret_invalid: Client secret is invalid (client_secret_invalid)
+        invalid_request: 'OAuth2 Authorization Server responded with ''invalid_request''. This error appears if you try to authorize multiple times or in case of technical issues.
+
+          '
+        invalid_response: OAuth2 Authorization Server provided an invalid response (invalid_response)
+        invalid_grant: The OAuth2 Authorization Server asks you to reauthorize (invalid_grant).
+        invalid_client: The OAuth2 Authorization Server doesn't recognize OpenProject (invalid_client).
+        unauthorized_client: The OAuth2 Authorization Server rejects the grant type (unauthorized_client)
+        unsupported_grant_type: The OAuth2 Authorization Server asks you to reauthorize (unsupported_grant_type).
+        invalid_scope: You are not allowed to access the requested resource (invalid_scope).
+  http:
+    request:
+      failed_authorization: The server side request failed authorizing itself.
+      missing_authorization: The server side request failed due to missing authorization information.
+    response:
+      unexpected: Unexpected response received.
+  you: you
+  link: link
+  plugin_openproject_auth_plugins:
+    name: OpenProject Auth Plugins
+    description: Integration of OmniAuth strategy providers for authentication in OpenProject.
+  plugin_openproject_auth_saml:
+    name: OmniAuth SAML / Single-Sign On
+    description: Adds the OmniAuth SAML provider to OpenProject
+  enterprise_plans:
+    legacy_enterprise: Enterprise Plan
+  token:
+    hashed_token:
+      display_value_placeholder: "***"
+  external_link_warning:
+    title: Leaving OpenProject
+    warning_message: You are about to leave OpenProject and visit an external website. Please be aware that external websites are not under our control and may have different privacy and security policies.
+    continue_message: Are you sure you want to proceed to the following external link?
+    continue_button: Continue to external website
diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml
index 3bbb9fdfb45..c0008a93da7 100644
--- a/config/locales/crowdin/id.yml
+++ b/config/locales/crowdin/id.yml
@@ -1320,6 +1320,37 @@ id:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Project
         enable_all: Enable for all projects
@@ -1418,8 +1449,8 @@ id:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2396,7 +2427,7 @@ id:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Kelompok tak bernama tidak dibolehkan.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4367,6 +4398,10 @@ id:
     one: 1 comment
     other: "%{count} komentar"
     zero: tak ada komentar
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} terbuka"
@@ -4694,13 +4729,6 @@ id:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Tambah Paket-Penugasan
   permission_add_messages: Kirim pesan
diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml
index 97185bea7a5..ecf09b6b40d 100644
--- a/config/locales/crowdin/it.yml
+++ b/config/locales/crowdin/it.yml
@@ -1337,6 +1337,37 @@ it:
     edit:
       form_configuration:
         tab: Configurazione del modulo
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Progetti
         enable_all: Abilita per tutti i progetti
@@ -1437,8 +1468,8 @@ it:
     bulk_delete_dialog:
       title: Elimina %{count} macro-attività
       heading: Eliminare definitivamente queste %{count} macro-attività?
-      description: 'Le seguenti macro-attività, inclusi gli elementi figli e tutti i dati associati, verranno eliminate definitivamente:'
-      description_with_children: 'Le seguenti macro-attività, incluse le macro-attività figlie e tutti i dati associati, verranno eliminate definitivamente:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: Confermo che tutte le macro-attività selezionate e le relative macro-attività figlie verranno eliminate definitivamente.
       cross_project_warning: 'Queste macro-attività comprendono più progetti: %{projects}'
       children_label: 'Verranno inoltre cancellati i seguenti figli:'
@@ -2412,7 +2443,7 @@ it:
               attribute_unknown_name: 'Attributo di macro-attività non valido utilizzato: %{attribute}'
               duplicate_group: Il nome di gruppo "%{group}" è usato più di una volta. I nomi dei gruppi devono essere univoci.
               query_invalid: 'La query incorporata "%{group}" non è valida: %{details}'
-              group_without_name: Non sono ammessi gruppi senza nome.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Uno o più attributi all'interno del campo non sono validi. Correggi gli attributi prima di salvare.
         user:
@@ -4420,6 +4451,10 @@ it:
     one: 1 commento
     other: "%{count} commenti"
     zero: nessun commento
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 aperto
     other: "%{count} aperti"
@@ -4752,13 +4787,6 @@ it:
       work_package_card_component:
         menu:
           label_actions: Azioni sulla macro-attività
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Aggiungi commenti
   permission_add_work_packages: Aggiungere macro-attività (work package)
   permission_add_messages: Postare messaggi
diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml
index 413cb643213..560d5f2829d 100644
--- a/config/locales/crowdin/ja.yml
+++ b/config/locales/crowdin/ja.yml
@@ -1322,6 +1322,37 @@ ja:
     edit:
       form_configuration:
         tab: フォームの設定
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: プロジェクト
         enable_all: すべてのプロジェクトで有効
@@ -1420,8 +1451,8 @@ ja:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2395,7 +2426,7 @@ ja:
               attribute_unknown_name: '無効なワークパッケージの属性が使用されています: %{attribute}'
               duplicate_group: グループ名 '%{group}' は複数回使用されています。グループ名は一意でなければなりません。
               query_invalid: 埋め込みクエリ '%{group}' は無効です： %{details}
-              group_without_name: 名前のないグループは指定できません。
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: フィールド内の1つ以上の属性が無効です。保存する前に属性を修正してください。
         user:
@@ -4359,6 +4390,10 @@ ja:
     one: 1件のコメント
     other: "%{count}件のコメント"
     zero: コメントがありません
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1件未完了
     other: "%{count}件未完了"
@@ -4684,13 +4719,6 @@ ja:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: コメントの追加
   permission_add_work_packages: ワークパッケージの追加
   permission_add_messages: メッセージの投稿
diff --git a/config/locales/crowdin/js-af.yml b/config/locales/crowdin/js-af.yml
index 39be3096870..0d3e4b6011c 100644
--- a/config/locales/crowdin/js-af.yml
+++ b/config/locales/crowdin/js-af.yml
@@ -202,16 +202,7 @@ af:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Pasgemaakte veld
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Voeg tabel van verwante werkpakkette toe
         edit_query: Edit query
-        new_group: Nuwe groep
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ af:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log tyd
diff --git a/config/locales/crowdin/js-ar.yml b/config/locales/crowdin/js-ar.yml
index 7bca67352c4..08d031633c8 100644
--- a/config/locales/crowdin/js-ar.yml
+++ b/config/locales/crowdin/js-ar.yml
@@ -202,16 +202,7 @@ ar:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: حقل مخصص
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: مجموعة جديدة
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -618,18 +609,6 @@ ar:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} كتب:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: وقت السجل
diff --git a/config/locales/crowdin/js-az.yml b/config/locales/crowdin/js-az.yml
index 4079c5005f6..fc444d6c5fb 100644
--- a/config/locales/crowdin/js-az.yml
+++ b/config/locales/crowdin/js-az.yml
@@ -202,16 +202,7 @@ az:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ az:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Jurnal vaxtı
diff --git a/config/locales/crowdin/js-be.yml b/config/locales/crowdin/js-be.yml
index 715f8014922..7716a713ca6 100644
--- a/config/locales/crowdin/js-be.yml
+++ b/config/locales/crowdin/js-be.yml
@@ -202,16 +202,7 @@ be:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Карыстальніцкае поле
-        inactive: Неактыўны
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -616,18 +607,6 @@ be:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Абнавіць да Enterprise on-premises edition
-        upgrade_to_ee_text: Нічога сабе! Калі вам патрэбны гэты дадатак, вы вялікі прафесіянал! Ці будзеце вы ветлівы падтрымаць нас, OpenSource распрацоўшчыкаў, пераўтварыўшыся ў карыстальніка Enterprise edition?
-        more_information: Дадатковыя звесткі
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-bg.yml b/config/locales/crowdin/js-bg.yml
index 7a84a3882b6..7bb891a0d8b 100644
--- a/config/locales/crowdin/js-bg.yml
+++ b/config/locales/crowdin/js-bg.yml
@@ -202,16 +202,7 @@ bg:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Потребителски полета
-        inactive: Неактивен
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Редактирай заявка
-        new_group: Нова група
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Възстановяване по подразбиране
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ bg:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} написа:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Повече информация
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Отчетено време
diff --git a/config/locales/crowdin/js-ca.yml b/config/locales/crowdin/js-ca.yml
index a8234eddcfa..640f6e26dd1 100644
--- a/config/locales/crowdin/js-ca.yml
+++ b/config/locales/crowdin/js-ca.yml
@@ -202,16 +202,7 @@ ca:
           text: "[Placeholder] Calendari incrustat"
     admin:
       type_form:
-        custom_field: Camp personalitzat
-        inactive: Inactiu
-        drag_to_activate: Arrossega els camps aquí per activar-los
-        add_group: Afegir atribut de grup
-        add_table: Afegeix una taula de paquets de treball relacionats
         edit_query: Editar consulta
-        new_group: Nou grup
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Restableix als valors per defecte
       working_days:
         calendar:
           empty_state_header: Dies no laborables
@@ -614,18 +605,6 @@ ca:
     breadcrumb: Breadcrumb
     text_data_lost: Totes les dades entrades es perdran.
     text_user_wrote: "%{value} va escriure:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: El nom %{group} ja està en ús. Els noms de grup han de ser únics.
-        error_no_table_configured: Si us plau, configuri una taula per a %{group}.
-        reset_title: Reiniciar la configuració del formulari
-        confirm_reset: 'Alerta: Estàs segur que vols reiniciar la configuració del formulari? Això reiniciarà els atributs als seus grups per defecte i desactivarà TOTS els camps personalitzats.
-
-          '
-        upgrade_to_ee: Actualitza a l'edició Enterprise on-premises
-        upgrade_to_ee_text: Ostres! Si necessita aquesta funció ets un súper pro! T'importaria donar suport als nostres desenvolupadors de codi obert convertint-te en client de l'edició Enterprise?
-        more_information: Més informació
-        nevermind: Sense importància
     time_entry:
       work_package_required: Requereix seleccionar un paquet de treball primer.
       title: Registrar temps
diff --git a/config/locales/crowdin/js-ckb-IR.yml b/config/locales/crowdin/js-ckb-IR.yml
index 79a003cdf4c..cddbba5f8f9 100644
--- a/config/locales/crowdin/js-ckb-IR.yml
+++ b/config/locales/crowdin/js-ckb-IR.yml
@@ -202,16 +202,7 @@ ckb-IR:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ ckb-IR:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-cs.yml b/config/locales/crowdin/js-cs.yml
index 576c363463a..3e6ab2286d0 100644
--- a/config/locales/crowdin/js-cs.yml
+++ b/config/locales/crowdin/js-cs.yml
@@ -202,16 +202,7 @@ cs:
           text: "[Placeholder] Vložený kalendář"
     admin:
       type_form:
-        custom_field: Vlastní pole
-        inactive: Neaktivní
-        drag_to_activate: Přetáhněte pole zde, abyste je aktivovali
-        add_group: Přidat skupinu atributů
-        add_table: Přidat seznam se souvisejícími pracovními balíčky
         edit_query: Upravit dotaz
-        new_group: Nová skupina
-        delete_group: Odstranit skupinu
-        remove_attribute: Odebrat ze skupiny
-        reset_to_defaults: Obnovit výchozí nastavení
       working_days:
         calendar:
           empty_state_header: Nepracovní dny
@@ -620,18 +611,6 @@ cs:
     breadcrumb: Navigační lišta
     text_data_lost: Všechna zadaná data budou ztracena.
     text_user_wrote: "%{value} napsal:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Jméno %{group} je již použito. Jména skupin musí být jedinečná.
-        error_no_table_configured: Prosím nastavte tabulku pro %{group}.
-        reset_title: Vyčistit konfiguraci formuláře
-        confirm_reset: 'Upozornění: Opravdu chcete resetovat konfiguraci formuláře? Tato akce obnoví atributy na jejich výchozí skupinu a zakáže VŠECHNY vlastní pole.
-
-          '
-        upgrade_to_ee: Upgradovat na Enterprise Edition on premises
-        upgrade_to_ee_text: Páni! Pokud potřebujete tuto funkci, jste super pro! Nevadili byste nám podpořit OpenSource vývojáře tím, že se stanete klientem Enterprise Edition?
-        more_information: Více informací
-        nevermind: Nevadí
     time_entry:
       work_package_required: Vyžaduje nejprve výběr pracovního balíčku.
       title: Čas protokolu
diff --git a/config/locales/crowdin/js-da.yml b/config/locales/crowdin/js-da.yml
index 6337f9f4311..e5932ee36d2 100644
--- a/config/locales/crowdin/js-da.yml
+++ b/config/locales/crowdin/js-da.yml
@@ -202,16 +202,7 @@ da:
           text: "[Placeholder] Embedded kalender"
     admin:
       type_form:
-        custom_field: Selvvalgt felt
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: Ny gruppe
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ da:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} skrev:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Tidsregistrering
diff --git a/config/locales/crowdin/js-de.yml b/config/locales/crowdin/js-de.yml
index 86a946bc6f1..0cc1627c537 100644
--- a/config/locales/crowdin/js-de.yml
+++ b/config/locales/crowdin/js-de.yml
@@ -202,16 +202,7 @@ de:
           text: "[Platzhalter] Eingebetteter Kalender"
     admin:
       type_form:
-        custom_field: Benutzerdefiniertes Feld
-        inactive: Inaktiv
-        drag_to_activate: Felder aus diesem Bereich herausziehen, um sie zu aktivieren
-        add_group: Attributgruppe hinzufügen
-        add_table: Tabelle mit zugehörigen Arbeitspaketen hinzufügen
         edit_query: Abfrage bearbeiten
-        new_group: Neue Gruppe
-        delete_group: Gruppe löschen
-        remove_attribute: Aus Gruppe entfernen
-        reset_to_defaults: Auf Standardwerte zurücksetzen
       working_days:
         calendar:
           empty_state_header: Arbeitsfreie Tage
@@ -616,18 +607,6 @@ de:
     breadcrumb: Navigationspfad
     text_data_lost: Alle eingegebenen Daten gehen verloren.
     text_user_wrote: "%{value} schrieb:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Der Name %{group} wird mehr als einmal verwendet. Gruppen-Namen müssen eindeutig sein.
-        error_no_table_configured: Bitte konfigurieren Sie eine Tabelle für %{group}.
-        reset_title: Formularkonfiguration zurücksetzen
-        confirm_reset: 'Achtung: Wollen Sie die Formkonfiguration wirklich zurücksetzen? Alle Attribute und Gruppen werden auf ihre Standardwerte zurück gesetzt und ALLE benutzerdefinierten Felder entfernt.
-
-          '
-        upgrade_to_ee: Enterprise on-premises bestellen
-        upgrade_to_ee_text: Wow! Wenn du dieses Add-on benötigst, bist du ein super Pro! Würdest du uns OpenProject-Entwickler unterstützen, indem du ein Enterprise Edition-Kunde wirst?
-        more_information: Weitere Informationen
-        nevermind: Nein danke
     time_entry:
       work_package_required: Benötigt zuerst die Auswahl eines Arbeitspakets.
       title: Zeit buchen
diff --git a/config/locales/crowdin/js-el.yml b/config/locales/crowdin/js-el.yml
index 47e4b8f2af0..73b75e52afa 100644
--- a/config/locales/crowdin/js-el.yml
+++ b/config/locales/crowdin/js-el.yml
@@ -202,16 +202,7 @@ el:
           text: "[Placeholder] Ενσωματωμένο ημερολόγιο"
     admin:
       type_form:
-        custom_field: Προσαρμοσμένο πεδίο
-        inactive: Ανενεργό
-        drag_to_activate: Σύρετε πεδία από εδώ για να τα ενεργοποιήσετε
-        add_group: Προσθήκη ομάδας χαρακτηριστικών
-        add_table: Προσθήκη πίνακα με σχετιζόμενες εργασίες
         edit_query: Επεξεργασία αναζήτησης
-        new_group: Νέα ομάδα
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Επαναφορά στα προεπιλεγμένα
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ el:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} έγραψε:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Το όνομα %{group} χρησιμοποιείται περισσότερες από μία φορές. Τα ονόματα ομάδων πρέπει να είναι μοναδικά.
-        error_no_table_configured: Παρακαλώ διαμορφώστε έναν πίνακα για %{group}.
-        reset_title: Επαναφορά φόρμας διαμόρφωσης
-        confirm_reset: 'Προειδοποίηση: Είστε σίγουροι ότι θέλετε να επαναφέρετε τη φόρμα διαμόρφωσης; Αυτό θα επαναφέρει τα χαρακτηριστικά στις προεπιλεγμένες ομάδες τους και θα απενεργοποιήσει ΌΛΑ τα προσαρμοσμένα πεδία.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Περισσότερες πληροφορίες
-        nevermind: Δεν πειράζει
     time_entry:
       work_package_required: Πρέπει πρώτα να επιλεγεί ένα πακέτο εργασίας.
       title: Καταγραφή χρόνου
diff --git a/config/locales/crowdin/js-eo.yml b/config/locales/crowdin/js-eo.yml
index aa809a8f2b6..dd342e621a4 100644
--- a/config/locales/crowdin/js-eo.yml
+++ b/config/locales/crowdin/js-eo.yml
@@ -202,16 +202,7 @@ eo:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Propra kampo
-        inactive: Neaktiva
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Aldoni tabelon de rilataj laborpakaĵoj
         edit_query: Edit query
-        new_group: Nova grupo
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Restarigi la defaŭltojn
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ eo:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Bonvolu agordi la tabelon por %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Pliaj informoj
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Tempoprotokolo
diff --git a/config/locales/crowdin/js-es.yml b/config/locales/crowdin/js-es.yml
index 06e82c44b0a..f25d7f0647c 100644
--- a/config/locales/crowdin/js-es.yml
+++ b/config/locales/crowdin/js-es.yml
@@ -200,16 +200,7 @@ es:
           text: "[Placeholder] Calendario insertado"
     admin:
       type_form:
-        custom_field: Campo personalizado
-        inactive: Inactivo
-        drag_to_activate: Arrastre campos desde aquí para activarlos
-        add_group: Agregar grupo de atributos
-        add_table: Agregar tabla de paquetes de trabajo relacionados
         edit_query: Editar consulta
-        new_group: Nuevo grupo
-        delete_group: Eliminar grupo
-        remove_attribute: Eliminar del grupo
-        reset_to_defaults: Restablecer valores predeterminados
       working_days:
         calendar:
           empty_state_header: Días no laborables
@@ -612,18 +603,6 @@ es:
     breadcrumb: Ruta de navegación
     text_data_lost: Todos los datos introducidos se perderán.
     text_user_wrote: "%{value} escribió:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: El nombre %{group} se ha usado más de una vez. Los nombres de grupos deben ser únicos.
-        error_no_table_configured: Configure una tabla para %{group}.
-        reset_title: Restablecer la configuración del formulario
-        confirm_reset: 'Advertencia: ¿Está seguro de que quiere restablecer la configuración del formulario? Se restablecerán los atributos al grupo predeterminado y se deshabilitarán TODOS los campos personalizados.
-
-          '
-        upgrade_to_ee: Actualizar a Enterprise On-Premises
-        upgrade_to_ee_text: "¡Vaya! Si necesita está extensión, entonces ¡es un usuario experto! ¿Le importaría apoyar a los desarrolladores de código abierto convirtiéndose en cliente de Enterprise?"
-        more_information: Más información
-        nevermind: No importa
     time_entry:
       work_package_required: Es necesario seleccionar primero un paquete de trabajo.
       title: Registro de tiempo
diff --git a/config/locales/crowdin/js-et.yml b/config/locales/crowdin/js-et.yml
index 1777a5cfcf6..1cd95638bf3 100644
--- a/config/locales/crowdin/js-et.yml
+++ b/config/locales/crowdin/js-et.yml
@@ -202,16 +202,7 @@ et:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Lisaväli
-        inactive: Mitteaktiivne
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: Uus rühm
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Taasta vaikesätted
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ et:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} kirjutas:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Lisainfo
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Ajakulu
diff --git a/config/locales/crowdin/js-eu.yml b/config/locales/crowdin/js-eu.yml
index 5849d78b37d..547e0875a64 100644
--- a/config/locales/crowdin/js-eu.yml
+++ b/config/locales/crowdin/js-eu.yml
@@ -202,16 +202,7 @@ eu:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ eu:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-fa.yml b/config/locales/crowdin/js-fa.yml
index 36c4f820b8e..7c38cfb1841 100644
--- a/config/locales/crowdin/js-fa.yml
+++ b/config/locales/crowdin/js-fa.yml
@@ -202,16 +202,7 @@ fa:
           text: "[Placeholder] تقویم جاسازی شده"
     admin:
       type_form:
-        custom_field: فیلدهای سفارشی
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ fa:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: ارتقاء به نسخه انترپرایز (on-premises) بر روی سرور مجازی یا اختصاصی شخصی خود
-        upgrade_to_ee_text: وااای! اگر به این افزونه نیاز دارید، شما یک حرفه‌ای هستید! آیا ممکن است ما توسعه‌دهندگان متن‌باز را با تبدیل شدن به مشتری نسخه انترپرایز حمایت کنید؟
-        more_information: اطلاعات بیشتر
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: پیگیری زمان
diff --git a/config/locales/crowdin/js-fi.yml b/config/locales/crowdin/js-fi.yml
index f2d8ae4680d..a65c8307e95 100644
--- a/config/locales/crowdin/js-fi.yml
+++ b/config/locales/crowdin/js-fi.yml
@@ -202,16 +202,7 @@ fi:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Mukautettu kenttä
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: Uusi ryhmä
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ fi:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} kirjoitti:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Lisätietoja
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Kirjaa työaika
diff --git a/config/locales/crowdin/js-fil.yml b/config/locales/crowdin/js-fil.yml
index cdce47f357a..efd9a8beae1 100644
--- a/config/locales/crowdin/js-fil.yml
+++ b/config/locales/crowdin/js-fil.yml
@@ -202,16 +202,7 @@ fil:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Pasadyang patlang
-        inactive: Hindi aktibo
-        drag_to_activate: I-drag ang mga patlang mula dito upang paganahin sila
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: Bagong grupo
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: I-reset sa mga default
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ fil:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} isinulat:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Ang pangalan ng %{group} ay ginamit higit pa sa isang beses. Ang mga pangalan ng grupo ay dapat nakakakatangi.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Karagdagang impornasyon
-        nevermind: Hindi bale
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Ang oras ng tala
diff --git a/config/locales/crowdin/js-fr.yml b/config/locales/crowdin/js-fr.yml
index d32b74f3917..124e3a2695c 100644
--- a/config/locales/crowdin/js-fr.yml
+++ b/config/locales/crowdin/js-fr.yml
@@ -202,16 +202,7 @@ fr:
           text: "[Placeholder] Calendrier embarqué"
     admin:
       type_form:
-        custom_field: Champ personnalisé
-        inactive: Inactif
-        drag_to_activate: Faire glisser les champs ici pour les activer
-        add_group: Ajouter un groupe d'attributs
-        add_table: Ajouter un tableau des lots de travaux associés
         edit_query: Modifier la requête
-        new_group: Nouveau groupe
-        delete_group: Supprimer le groupe
-        remove_attribute: Retirer du groupe
-        reset_to_defaults: Rétablir les valeurs par défaut
       working_days:
         calendar:
           empty_state_header: Jours non travaillés
@@ -614,18 +605,6 @@ fr:
     breadcrumb: Fil d'Ariane
     text_data_lost: Toutes les données saisies seront perdues.
     text_user_wrote: "%{value} écrit:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Le nom %{group} est utilisé plus d'une fois. Les noms de groupe doivent être uniques.
-        error_no_table_configured: Veuillez configurer un tableau pour %{group}.
-        reset_title: Réinitialiser la configuration du formulaire
-        confirm_reset: 'Avertissement : voulez-vous vraiment réinitialiser la configuration du formulaire ? Ceci va réinitialiser les attributs à leur groupe par défaut et désactiver TOUS les champs personnalisés.
-
-          '
-        upgrade_to_ee: Mettre à niveau vers la version Entreprise autohébergée
-        upgrade_to_ee_text: Waouh ! Si vous avez besoin de cette fonctionnalité, vous êtes un véritable pro ! Cela vous dérangerait-il de soutenir les développeurs Open Source en devenant un client de la version Entreprise ?
-        more_information: Plus d'informations
-        nevermind: Peu importe
     time_entry:
       work_package_required: Nécessite d'abord la sélection d'un lot de travaux.
       title: Consigner du temps
diff --git a/config/locales/crowdin/js-he.yml b/config/locales/crowdin/js-he.yml
index dd7cbcb4097..2ac42316e87 100644
--- a/config/locales/crowdin/js-he.yml
+++ b/config/locales/crowdin/js-he.yml
@@ -202,16 +202,7 @@ he:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: שדה מותאם אישית
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: קבוצה חדשה
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -616,18 +607,6 @@ he:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: נרשם ביומן
diff --git a/config/locales/crowdin/js-hi.yml b/config/locales/crowdin/js-hi.yml
index 642a717e2db..a850c813851 100644
--- a/config/locales/crowdin/js-hi.yml
+++ b/config/locales/crowdin/js-hi.yml
@@ -202,16 +202,7 @@ hi:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: रुचि के अनुसार फिल्ड
-        inactive: Inactive
-        drag_to_activate: उंहें सक्रिय करने के लिए यहां से फ़ील्ड्स खींचें
-        add_group: विशेषता समूह जोड़ें
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: नया समूह
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ hi:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: लॉग समय
diff --git a/config/locales/crowdin/js-hr.yml b/config/locales/crowdin/js-hr.yml
index 67c0035186c..fdd2f8ba839 100644
--- a/config/locales/crowdin/js-hr.yml
+++ b/config/locales/crowdin/js-hr.yml
@@ -202,16 +202,7 @@ hr:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Prilagođeno polje
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: Nova grupa
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -615,18 +606,6 @@ hr:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} je napisao:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Više informacija
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Vrijeme pristupa
diff --git a/config/locales/crowdin/js-hu.yml b/config/locales/crowdin/js-hu.yml
index 3e630f2f4ce..33bbfea469a 100644
--- a/config/locales/crowdin/js-hu.yml
+++ b/config/locales/crowdin/js-hu.yml
@@ -214,16 +214,7 @@ hu:
           text: "[Placeholder] Beágyazott naptár"
     admin:
       type_form:
-        custom_field: Választható mező
-        inactive: Inaktív
-        drag_to_activate: Innen húzza a mezőket, hogy aktiválja
-        add_group: Tulajdonságcsoport
-        add_table: Táblázat hozzáadása a kapcsolódó munkacsomagokhoz
         edit_query: Lekérdezés módosítása
-        new_group: Új csoport
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Alapbeállítások visszaállítása
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -644,18 +635,6 @@ hu:
     breadcrumb: Breadcrumb
     text_data_lost: Az összes adat elveszhet
     text_user_wrote: "%{value} írta:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: A %{group} név már használatban van. A csoport névnek egyedinek kell lennie.
-        error_no_table_configured: Kérem konfigurálja a táblát a %{group}
-        reset_title: Űrlap konfiguráció visszaállítása
-        confirm_reset: 'Figyelmeztetés: Biztosan visszaállítja az alap űrlap beállítást? Az attribútumok az alapértelmezett csoportba kerülnek, a láthatósági beállítások elvesznek és MINDEN egyéni mező deaktiválódik.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: További információ
-        nevermind: Mindegy
     time_entry:
       work_package_required: Először ki kell választania egy munkacsomagot.
       title: Eltöltött idő rögzítése
diff --git a/config/locales/crowdin/js-hy.yml b/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..5aead332475
--- /dev/null
+++ b/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,1119 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    ajax:
+      hide: Hide
+      loading: Loading…
+      updating: Updating…
+    attachments:
+      delete: Delete attachment
+      delete_confirmation: 'Are you sure you want to delete this file? This action is not reversible.
+
+        '
+      draggable_hint: 'Drag on editor field to inline image or reference attachment. Closed editor fields will be opened while you keep dragging.
+
+        '
+      quarantined_hint: The file is quarantined, as a virus was found. It is not available for download.
+    autocomplete_ng_select:
+      add_tag: Add item
+      clear_all: Clear all
+      loading: Loading...
+      not_found: No items found
+      type_to_search: Type to search
+    autocomplete_select:
+      placeholder:
+        multi: Add "%{name}"
+        single: Select "%{name}"
+      remove: Remove %{name}
+      active: Active %{label} %{name}
+    backup:
+      attachments_disabled: Attachments may not be included since they exceed the maximum overall size allowed. You can change this via the configuration (requires a server restart).
+      info: 'You can trigger a backup here. The process can take some time depending on the amount of data (especially attachments) you have. You will receive an email once it''s ready.
+
+        '
+      note: 'A new backup will override any previous one. Only a limited number of backups per day can be requested.
+
+        '
+      last_backup: Last backup
+      last_backup_from: Last backup from
+      title: Backup OpenProject
+      options: Options
+      include_attachments: Include attachments
+      download_backup: Download backup
+      request_backup: Request backup
+    close_popup_title: Close popup
+    close_filter_title: Close filter
+    close_form_title: Close form
+    button_add_watcher: Add watcher
+    button_add: Add
+    button_back: Back
+    button_back_to_list_view: Back to list view
+    button_cancel: Cancel
+    button_close: Close
+    button_change_project: Move to another project
+    button_check_all: Check all
+    button_configure-form: Configure form
+    button_confirm: Confirm
+    button_continue: Continue
+    button_copy: Copy
+    button_copy_to_clipboard: Copy to clipboard
+    button_copy_link_to_clipboard: Copy link to clipboard
+    button_copy_to_other_project: Duplicate in another project
+    button_custom-fields: Custom fields
+    button_delete: Delete
+    button_delete_watcher: Delete watcher
+    button_details_view: Details view
+    button_duplicate: Duplicate
+    button_edit: Edit
+    button_filter: Filter
+    button_collapse_all: Collapse all
+    button_expand_all: Expand all
+    button_advanced_filter: Advanced filter
+    button_list_view: List view
+    button_show_view: Fullscreen view
+    button_log_time: Log time
+    button_start_timer: Start timer
+    button_stop_timer: Stop timer
+    button_more: More
+    button_open_details: Open details view
+    button_close_details: Close details view
+    button_open_fullscreen: Open fullscreen view
+    button_show_cards: Show card view
+    button_show_list: Show list view
+    button_show_table: Show table view
+    button_show_gantt: Show Gantt view
+    button_show_fullscreen: Show fullscreen view
+    button_more_actions: More actions
+    button_quote: Quote
+    button_save: Save
+    button_settings: Settings
+    button_uncheck_all: Uncheck all
+    button_update: Update
+    button_export-atom: Download Atom
+    button_generate_pdf: Generate PDF
+    button_create: Create
+    card:
+      add_new: Add new card
+      highlighting:
+        inline: 'Highlight inline:'
+        entire_card_by: Entire card by
+      remove_from_list: Remove card from list
+    caption_rate_history: Rate history
+    clipboard:
+      browser_error: 'Your browser doesn''t support copying to clipboard. Please copy it manually: %{content}'
+      copied_successful: Successfully copied to clipboard!
+    chart:
+      type: Chart type
+      axis_criteria: Axis criteria
+      modal_title: Work package graph configuration
+      types:
+        line: Line
+        horizontal_bar: Horizontal bar
+        bar: Bar
+        pie: Pie
+        doughnut: Doughnut
+        radar: Radar
+        polar_area: Polar area
+      tabs:
+        graph_settings: General
+        dataset: Dataset %{number}
+      errors:
+        could_not_load: The data to display the graph could not be loaded. The necessary permissions may be lacking.
+    description_available_columns: Available Columns
+    description_current_position: 'You are here: '
+    description_select_work_package: 'Select work package #%{id}'
+    description_subwork_package: 'Child of work package #%{id}'
+    editor:
+      revisions: Show local modifications
+      no_revisions: No local modifications found
+      preview: Toggle preview mode
+      source_code: Toggle Markdown source mode
+      error_saving_failed: 'Saving the document failed with the following error: %{error}'
+      ckeditor_error: An error occurred within CKEditor
+      mode:
+        manual: Switch to Markdown source
+        wysiwyg: Switch to WYSIWYG editor
+      macro:
+        error: 'Cannot expand macro: %{message}'
+        attribute_reference:
+          macro_help_tooltip: This text segment is being dynamically rendered by a macro.
+          not_found: Requested resource could not be found
+          nested_macro: This macro is recursively referencing %{model} %{id}.
+          invalid_attribute: The selected attribute '%{name}' does not exist.
+        child_pages:
+          button: Links to child pages
+          include_parent: Include parent
+          text: "[Placeholder] Links to child pages of"
+          page: Wiki page
+          this_page: this page
+          hint: 'Leave this field empty to list all child pages of the current page. If you want to reference a different page, provide its title or slug.
+
+            '
+        code_block:
+          button: Insert code snippet
+          title: Insert / edit Code snippet
+          language: Formatting language
+          language_hint: Enter the formatting language that will be used for highlighting (if supported).
+        dropdown:
+          macros: Macros
+          chose_macro: Choose macro
+        toc: Table of contents
+        toolbar_help: Click to select widget and show the toolbar. Double-click to edit widget
+        wiki_page_include:
+          button: Include content of another wiki page
+          text: "[Placeholder] Included wiki page of"
+          page: Wiki page
+          not_set: "(Page not yet set)"
+          hint: |
+            Include the content of another wiki page by specifying its title or slug.
+            You can include the wiki page of another project by separating them with a colon like the following example.
+        work_package_button:
+          button: Insert create work package button
+          type: Work package type
+          button_style: Use button style
+          button_style_hint: 'Optional: Check to make macro appear as a button, not as a link.'
+          without_type: Create work package
+          with_type: 'Create work package (Type: %{typename})'
+        embedded_table:
+          button: Embed work package table
+          text: "[Placeholder] Embedded work package table"
+        embedded_calendar:
+          text: "[Placeholder] Embedded calendar"
+    admin:
+      type_form:
+        edit_query: Edit query
+      working_days:
+        calendar:
+          empty_state_header: Non-working days
+          empty_state_description: No specific non-working days are defined for this year. Click on "+ Non-working day" below to add a date.
+          new_date: "(new)"
+        add_non_working_day: Non-working day
+        already_added_error: A non-working day for this date exists already. There can only be one non-working day created for each unique date.
+        change_button: Save and reschedule
+        change_title: Change working days
+        removed_title: 'You will remove the following days from the non-working days list:'
+        change_description: Changing which days of the week are considered working days or non-working days can affect the start and finish days of all work packages and life cycles in all projects in this instance.
+        warning: 'The changes might take some time to take effect. You will be notified when all relevant work packages and project life cycles have been updated. Are you sure you want to continue?
+
+          '
+      work_packages_settings:
+        warning_progress_calculation_mode_change_from_status_to_field_html: Changing progress calculation mode from status-based to work-based will make the <i>% Complete</i> field freely editable. If you optionally enter values for <i>Work</i> or <i>Remaining work</i>, they will also be linked to <i>% Complete</i>. Changing <i>Remaining work</i> can then update <i>% Complete</i>.
+        warning_progress_calculation_mode_change_from_field_to_status_html: Changing progress calculation mode from work-based to status-based will result in all existing <i>% Complete</i> values to be lost and replaced with values associated with each status. Existing values for <i>Remaining work</i> may also be recalculated to reflect this change. This action is not reversible.
+    custom_actions:
+      date:
+        specific: 'on'
+        current_date: Current date
+    error:
+      internal: An internal error has occurred.
+      cannot_save_changes_with_message: 'Cannot save your changes due to the following error: %{error}'
+      query_saving: The view could not be saved.
+      embedded_table_loading: 'The embedded view could not be loaded: %{message}'
+    enumeration_activities: Activities (time tracking)
+    enumeration_doc_categories: Document categories
+    enumeration_work_package_priorities: Work package priorities
+    filter:
+      more_values_not_shown: There are %{total} more results, search to filter results.
+      description:
+        text_open_filter: Open this filter with 'ALT' and arrow keys.
+        text_close_filter: To select an entry leave the focus for example by pressing enter. To leave without filter select the first (empty) entry.
+      noneElement: "(none)"
+      time_zone_converted:
+        two_values: "%{from} - %{to} in your local time."
+        only_start: From %{from} in your local time.
+        only_end: Till %{to} in your local time.
+      value_spacer: "-"
+      sorting:
+        criteria:
+          one: First sorting criteria
+          two: Second sorting criteria
+          three: Third sorting criteria
+    gantt_chart:
+      label: Gantt chart
+      quarter_label: Q%{quarter_number}
+      labels:
+        title: Label configuration
+        bar: Bar labels
+        left: Left
+        right: Right
+        farRight: Far right
+        description: 'Select the attributes you want to be shown in the respective positions of the Gantt chart at all times. Note that when hovering over an element, its date labels will be shown instead of these attributes.
+
+          '
+      button_activate: Show Gantt chart
+      button_deactivate: Hide Gantt chart
+      filter:
+        noneSelection: "(none)"
+      selection_mode:
+        notification: Click on any highlighted work package to create the relation. Press escape to cancel.
+      zoom:
+        in: Zoom in
+        out: Zoom out
+        auto: Auto zoom
+        days: Days
+        weeks: Weeks
+        months: Months
+        quarters: Quarters
+        years: Years
+        description: 'Select the initial zoom level that should be shown when autozoom is not available.
+
+          '
+    general_text_no: 'no'
+    general_text_yes: 'yes'
+    general_text_No: 'No'
+    general_text_Yes: 'Yes'
+    hal:
+      error:
+        update_conflict_refresh: Click here to refresh the resource and update to the newest version.
+        edit_prohibited: Editing %{attribute} is blocked for this resource. Either this attribute is derived from relations (e.g, children) or otherwise not configurable.
+        format:
+          date: "%{attribute} is no valid date - YYYY-MM-DD expected."
+        general: An error has occurred.
+    ical_sharing_modal:
+      title: Subscribe to calendar
+      inital_setup_error_message: An error occured while fetching data.
+      description: You can use the URL (iCalendar) to subscribe to this calendar in an external client and view up-to-date work package information from there.
+      warning: Please don't share this URL with other users. Anyone with this link will be able to view work package details without an account or password.
+      token_name_label: Where will you be using this?
+      token_name_placeholder: Type a name, e.g. "Phone"
+      token_name_description_text: If you subscribe to this calendar from multiple devices, this name will help you distinguish between them in your <a href="%{myAccessTokensUrl}" target="_blank">access tokens</a> list.
+      copy_url_label: Copy URL
+      ical_generation_error_text: An error occured while generating the calendar URL.
+      success_message: The URL "%{name}" was successfully copied to your clipboard. Paste it in your calendar client to complete the subscription.
+    label_activate: Activate
+    label_assignee: Assignee
+    label_assignee_alt_text: This work package is assigned to %{name}
+    label_add_column_after: Add column after
+    label_add_column_before: Add column before
+    label_add_columns: Add columns
+    label_add_comment: Add comment
+    label_add_comment_title: Comment and type @ to notify other people
+    label_add_row_after: Add row after
+    label_add_row_before: Add row before
+    label_add_selected_columns: Add selected columns
+    label_added_by: added by
+    label_added_time_by: Added by <a href="%{authorLink}">%{author}</a> at %{age}
+    label_ago: days ago
+    label_all: all
+    label_all_projects: All projects
+    label_all_uppercase: All
+    label_all_work_packages: all work packages
+    label_and: and
+    label_ascending: Ascending
+    label_author: 'Author: %{user}'
+    label_avatar: Avatar
+    label_between: between
+    label_board: Board
+    label_board_locked: Locked
+    label_board_plural: Boards
+    label_board_sticky: Sticky
+    label_change: Change
+    label_create: Create
+    label_create_work_package: Create new work package
+    label_created_by: Created by
+    label_current: current
+    label_date: Date
+    label_date_with_format: 'Enter the %{date_attribute} using the following format: %{format}'
+    label_deactivate: Deactivate
+    label_descending: Descending
+    label_description: Description
+    label_details: Details
+    label_display: Display
+    label_cancel_comment: Cancel comment
+    label_closed_work_packages: closed
+    label_collapse: Collapse
+    label_collapsed: collapsed
+    label_collapse_all: Collapse all
+    label_collapse_text: Collapse text
+    label_comment: Comment
+    label_contains: contains
+    label_created_on: created on
+    label_edit_comment: Edit this comment
+    label_edit_status: Edit the status of the work package
+    label_email: Email
+    label_equals: is
+    label_expand: Expand
+    label_expanded: expanded
+    label_expand_all: Expand all
+    label_expand_text: Show full text
+    label_expand_project_menu: Expand project menu
+    label_export: Export
+    label_export_preparing: The export is being prepared and will be downloaded shortly.
+    label_favorites: Favorites
+    label_filename: File
+    label_filesize: Size
+    label_general: General
+    label_greater_or_equal: ">="
+    label_group: Group
+    label_group_by: Group by
+    label_group_plural: Groups
+    label_hide_attributes: Show less
+    label_hide_column: Hide column
+    label_hide_project_menu: Collapse project menu
+    label_in: in
+    label_in_less_than: in less than
+    label_in_more_than: in more than
+    label_incoming_emails: Incoming emails
+    label_information_plural: Information
+    label_invalid: Invalid
+    label_import: Import
+    label_latest_activity: Latest activity
+    label_last_updated_on: Last updated on
+    label_learn_more_link: Learn more
+    label_less_or_equal: "<="
+    label_less_than_ago: less than days ago
+    label_loading: Loading...
+    label_mail_notification: Email notifications
+    label_manage_columns: Manage and reorder columns
+    label_me: me
+    label_meeting_agenda: Agenda
+    label_meeting_minutes: Minutes
+    label_more_than_ago: more than days ago
+    label_moderate_comment: Moderate comment
+    label_next: Next
+    label_no_color: No color
+    label_no_data: No data to display
+    label_no_due_date: no finish date
+    label_no_start_date: no start date
+    label_no_date: no date
+    label_no_value: No value
+    label_none: none
+    label_not_contains: doesn't contain
+    label_not_equals: is not
+    label_on: 'on'
+    label_open_menu: Open menu
+    label_open_context_menu: Open context menu
+    label_open_work_packages: open
+    label_password: Password
+    label_previous: Previous
+    label_per_page: 'Per page:'
+    label_please_wait: Please wait
+    label_project: Project
+    label_project_list: Project lists
+    label_project_plural: Projects
+    label_visibility_settings: Visibility settings
+    label_quote_comment: Quote this comment
+    label_recent: Recent
+    label_reset: Reset
+    label_remove: Remove
+    label_remove_column: Remove column
+    label_remove_columns: Remove selected columns
+    label_remove_row: Remove row
+    label_report: Report
+    label_repository_plural: Repositories
+    label_resize_project_menu: Resize project menu
+    label_save_as: Save as
+    label_search_columns: Search a column
+    label_select_watcher: Select a watcher...
+    label_selected_filter_list: Selected filters
+    label_show_attributes: Show all attributes
+    label_show_in_menu: Show view in menu
+    label_sort_by: Sort by
+    label_sorted_by: sorted by
+    label_sort_higher: Move up
+    label_sort_lower: Move down
+    label_sorting: Sorting
+    label_spent_time: Spent time
+    label_star_query: Favorited
+    label_press_enter_to_save: Press enter to save.
+    label_public_query: Public
+    label_sum: Sum
+    label_sum_for: Sum for
+    label_total_sum: Total sum
+    label_subject: Subject
+    label_this_week: this week
+    label_today: Today
+    label_time_entry_plural: Spent time
+    label_up: Up
+    label_user_plural: Users
+    label_activity_show_only_comments: Show activities with comments only
+    label_activity_show_all: Show all activities
+    label_total_progress: "%{percent}% Total progress"
+    label_total_amount: 'Total: %{amount}'
+    label_updated_on: updated on
+    label_value_derived_from_children: "(value derived from children)"
+    label_children_derived_duration: Work package's children derived duration
+    label_warning: Warning
+    label_work_package: Work package
+    label_work_package_parent: Parent work package
+    label_work_package_plural: Work packages
+    label_watch: Watch
+    label_watch_work_package: Watch work package
+    label_watcher_added_successfully: Watcher successfully added!
+    label_watcher_deleted_successfully: Watcher successfully deleted!
+    label_work_package_details_you_are_here: You are on the %{tab} tab for %{type} %{subject}.
+    label_work_package_context_menu: Work package context menu
+    label_unwatch: Unwatch
+    label_unwatch_work_package: Unwatch work package
+    label_uploaded_by: Uploaded by
+    label_default_queries: Default
+    label_starred_queries: Favorite
+    label_global_queries: Public
+    label_custom_queries: Private
+    label_columns: Columns
+    label_attachments: Attachments
+    label_drop_files: Drop files here to attach files.
+    label_drop_or_click_files: Drop files here or click to attach files.
+    label_drop_folders_hint: You cannot upload folders as an attachment. Please select single files.
+    label_add_attachments: Attach files
+    label_formattable_attachment_hint: Attach and link files by dropping on this field, or pasting from the clipboard.
+    label_remove_file: Delete %{fileName}
+    label_remove_watcher: Remove watcher %{name}
+    label_remove_all_files: Delete all files
+    label_add_description: Add a description for %{file}
+    label_upload_notification: Uploading files...
+    label_work_package_upload_notification: 'Uploading files for Work package #%{id}: %{subject}'
+    label_wp_id_added_by: "#%{id} added by %{author}"
+    label_files_to_upload: 'These files will be uploaded:'
+    label_rejected_files: 'These files cannot be uploaded:'
+    label_rejected_files_reason: These files cannot be uploaded as their size is greater than %{maximumFilesize}
+    label_wait: Please wait for configuration...
+    label_upload_counter: "%{done} of %{count} files finished"
+    label_validation_error: 'The work package could not be saved due to the following errors:'
+    label_version_plural: Versions
+    label_view_has_changed: This view has unsaved changes. Click to save them.
+    help_texts:
+      show_modal: Show help text
+    onboarding:
+      buttons:
+        skip: Skip
+        next: Next
+        got_it: Got it
+      steps:
+        help_menu: The Help (?) menu provides <b>additional help resources</b>. Here you can find a user guide, helpful how-to videos and more. <br> Enjoy your work with OpenProject!
+        members: Invite new <b>members</b> to join your project.
+        quick_add_button: Click on the plus (+) icon in the header navigation to <b>create a new project</b> or to <b>invite coworkers</b>.
+        sidebar_arrow: Use the return arrow in the top left corner to return to the project’s <b>main menu</b>.
+        welcome: Take a three-minute introduction tour to learn the most <b>important features</b>. <br> We recommend completing the steps until the end. You can restart the tour any time.
+        wiki: Within the <b>wiki</b> you can document and share knowledge together with your team.
+        boards:
+          overview: Select <b>boards</b> to shift the view and manage your project using the agile boards view.
+          lists_kanban: Here you can create multiple lists (columns) within your board. This feature allows you to create a <b>Kanban board</b>, for example.
+          lists_basic: Here you can create multiple lists (columns) within your agile board.
+          add: Click on the plus (+) icon to <b>create a new card</b> or <b>add an existing card</b> to the list on the board.
+          drag: Drag and drop your cards within a given list to reorder them, or to move them to another list. <br> You can click the info (i) icon in the upper right-hand corner or double-click a card to open its details.
+        wp:
+          toggler: Now let's have a look at the <b>work package</b> section, which gives you a more detailed view of your work.
+          list: This <b>work</b> package overview provides a list of all the work in your project, such as tasks, milestones, phases, and more. <br> Work packages can be created and edited directly from this view. To access the details of a particular work package, simply double-click its row.
+          full_view: The <b>work package details</b> view provides all the relevant information pertaining to a given work package, such as its description, status, priority, activities, dependencies, and comments.
+          back_button: Use the return arrow in the top left corner to exit and return to the work package list.
+          create_button: The <b>+ Create</b> button will add a new work package to your project.
+          gantt_menu: Create project schedules and timelines effortlessly using the Gantt chart module.
+          timeline: Here you can <b>edit your project plan</b>, create new work packages, such as tasks, milestones, phases, and more, as well as <b>add dependencies</b>. All team members can see and update the latest plan at any time.
+        team_planner:
+          overview: The team planner lets you visually assign tasks to team members and get an overview of who is working on what.
+          calendar: The weekly or biweekly planning board displays all work packages assigned to your team members.
+          add_assignee: To get started, add assignees to the team planner.
+          add_existing: Search for existing work packages and drag them to the team planner to instantly assign them to a team member and define start and end dates.
+          card: Drag work packages horizontally to move them backwards or forwards in time, drag the edges to change start and end dates and even drag them vertically to a different row to assign them to another member.
+    notifications:
+      title: Notifications
+      no_unread: No unread notifications
+      reasons:
+        mentioned: Mentioned
+        watched: Watcher
+        assigned: Assignee
+        responsible: Accountable
+        created: Created
+        scheduled: Scheduled
+        commented: Commented
+        processed: Processed
+        prioritized: Prioritized
+        dateAlert: Date alert
+        shared: Shared
+        reminder: Reminder
+      date_alerts:
+        milestone_date: Milestone date
+        overdue: Overdue
+        overdue_since: for %{difference_in_days}.
+        property_today: is today.
+        property_is: is in %{difference_in_days}.
+        property_was: was %{difference_in_days} ago.
+        property_is_deleted: is deleted.
+      center:
+        label_actor_and: and
+        and_more_users:
+          one: and 1 other
+          other: and %{count} others
+        no_results:
+          at_all: New notifications will appear here when there is activity that concerns you.
+          with_current_filter: There are no notifications in this view at the moment
+        mark_all_read: Mark all as read
+        mark_as_read: Mark as read
+        mark_all_read_confirmation: This will mark all notifications in this view as read. Are you sure you want to do this?
+        text_update_date_by: "%{date} by"
+        total_count_warning: Showing the %{newest_count} most recent notifications. %{more_count} more are not displayed.
+        empty_state:
+          no_notification: Looks like you are all caught up.
+          no_notification_with_current_project_filter: Looks like you are all caught up with the selected project.
+          no_notification_with_current_filter: Looks like you are all caught up for %{filter} filter.
+          no_notification_for_filter: Looks like you are all caught up for this filter.
+          no_selection: Click on a notification to view all activity details.
+        new_notifications:
+          message: There are new notifications.
+          link_text: Click here to load them.
+      reminders:
+        note: 'Note: “%{note}”'
+      settings:
+        change_notification_settings: You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.
+        title: Notification settings
+    pagination:
+      no_other_page: You are on the only page.
+      pages_skipped: Pages skipped.
+      page_navigation: Pagination navigation
+      per_page_navigation: Items per page selection
+      pages:
+        page_number: Page %{number}
+        show_per_page: Show %{number} per page
+    placeholders:
+      default: "-"
+      subject: Enter subject here
+      selection: Please select
+      description: 'Description: Click to edit...'
+      relation_description: Click to add description for this relation
+    project:
+      autocompleter:
+        label: Project autocompletion
+      click_to_switch_to_project: 'Project: %{projectname}'
+      context: Project context
+      not_available: Project N/A
+      required_outside_context: 'Please choose a project to create the work package in to see all attributes. You can only select projects which have the type above activated.
+
+        '
+    text_are_you_sure: Are you sure?
+    text_are_you_sure_to_cancel: You have unsaved changes on this page. Are you sure you want to discard them?
+    breadcrumb: Breadcrumb
+    text_data_lost: All entered data will be lost.
+    text_user_wrote: "%{value} wrote:"
+    time_entry:
+      work_package_required: Requires selecting a work package first.
+      title: Log time
+      tracking: Time tracking
+      stop: Stop
+    timer:
+      start_new_timer: Start new timer
+      timer_already_running: 'To start a new timer, you must first stop the current timer:'
+      timer_already_stopped: No active timer for this work package, have you stopped it in another window?
+      tracking_time: Tracking time
+      button_stop: Stop current timer
+    two_factor_authentication:
+      label_two_factor_authentication: Two-factor authentication
+    watchers:
+      label_loading: loading watchers...
+      label_error_loading: An error occurred while loading the watchers
+      label_search_watchers: Search watchers
+      label_add: Add watchers
+      label_discard: Discard selection
+      typeahead_placeholder: Search for possible watchers
+    relation_labels:
+      parent: Parent
+      child: Child
+      children: Children
+      relates: Related To
+      duplicates: Duplicates
+      duplicated: Duplicated by
+      blocks: Blocks
+      blocked: Blocked by
+      precedes: Precedes
+      follows: Follows
+      includes: Includes
+      partof: Part of
+      requires: Requires
+      required: Required by
+      relation_type: relation type
+    relations_hierarchy:
+      parent_headline: Parent
+      hierarchy_headline: Hierarchy
+      children_headline: Children
+    relation_buttons:
+      set_parent: Set parent
+      change_parent: Change parent
+      remove_parent: Remove parent
+      hierarchy_indent: Indent hierarchy
+      hierarchy_outdent: Outdent hierarchy
+      group_by_wp_type: Group by work package type
+      group_by_relation_type: Group by relation type
+      add_parent: Add existing parent
+      add_new_child: Create new child
+      create_new: Create new
+      add_existing: Add existing
+      add_existing_child: Add child
+      remove_child: Remove child
+      add_new_relation: Create new relation
+      add_existing_relation: Add existing relation
+      update_description: Set or update description of this relation
+      toggle_description: Toggle relation description
+      update_relation: Click to change the relation type
+      show_relations: Show relations
+      add_predecessor: Add predecessor
+      add_successor: Add successor
+      remove: Remove relation
+      save: Save relation
+      abort: Abort
+    relations_autocomplete:
+      placeholder: Type to search
+      parent_placeholder: Choose new parent or press escape to cancel.
+    autocompleter:
+      placeholder: Type to search
+      notFoundText: No items found
+      search: Search
+      project:
+        placeholder: Select project
+    repositories:
+      select_tag: Select tag
+      select_branch: Select branch
+    field_value_enter_prompt: Enter a value for '%{field}'
+    project_menu_details: Details
+    sort:
+      sorted_asc: 'Ascending sort applied, '
+      sorted_dsc: 'Descending sort applied, '
+      sorted_no: 'No sort applied, '
+      sorting_disabled: sorting is disabled
+      activate_asc: activate to apply an ascending sort
+      activate_dsc: activate to apply a descending sort
+      activate_no: activate to remove the sort
+    text_work_packages_destroy_confirmation: Are you sure you want to delete the selected work package(s)?
+    text_query_destroy_confirmation: Are you sure you want to delete the selected view?
+    tl_toolbar:
+      zooms: Zoom level
+      outlines: Hierarchy level
+    upsell:
+      ee_only: Enterprise edition add-on
+    wiki_formatting:
+      strong: Strong
+      italic: Italic
+      underline: Underline
+      deleted: Deleted
+      code: Inline Code
+      heading1: Heading 1
+      heading2: Heading 2
+      heading3: Heading 3
+      unordered_list: Unordered List
+      ordered_list: Ordered List
+      quote: Quote
+      unquote: Unquote
+      preformatted_text: Preformatted Text
+      wiki_link: Link to a Wiki page
+      image: Image
+    sharing:
+      share: Share
+      selected_count: "%{count} selected"
+      selection:
+        mixed: Mixed
+    work_packages:
+      bulk_actions:
+        edit: Bulk edit
+        delete: Bulk delete
+        duplicate: Bulk duplicate
+        move: Bulk change of project
+      button_clear: Clear
+      comment_added: The comment was successfully added.
+      comment_send_failed: An error has occurred. Could not submit the comment.
+      comment_updated: The comment was successfully updated.
+      confirm_edit_cancel: Are you sure you want to cancel editing the work package?
+      description_filter: Filter
+      description_enter_text: Enter text
+      description_options_hide: Hide options
+      description_options_show: Show options
+      edit_attribute: "%{attribute} - Edit"
+      key_value: "%{key}: %{value}"
+      label_enable_multi_select: Enable multiselect
+      label_disable_multi_select: Disable multiselect
+      label_filter_add: Add filter
+      label_filter_by_text: Filter by text
+      label_options: Options
+      label_column_multiselect: 'Combined dropdown field: Select with arrow keys, confirm selection with enter, delete with backspace'
+      message_error_during_bulk_delete: An error occurred while trying to delete work packages.
+      message_successful_bulk_delete: Successfully deleted work packages.
+      message_successful_show_in_fullscreen: Click here to open this work package in fullscreen view.
+      message_view_spent_time: Show spent time for this work package
+      message_work_package_read_only: Work package is locked in this status. No attribute other than status can be altered.
+      message_work_package_status_blocked: Work package status is not writable due to closed status and closed version being assigned.
+      placeholder_filter_by_text: Subject, description, comments, ...
+      progress:
+        title: Work estimates and progress
+      baseline:
+        addition_label: Added to view within the comparison time period
+        removal_label: Removed from view within the comparison time period
+        modification_label: Modified within the comparison time period
+        column_incompatible: This column does not show changes in Baseline mode.
+      filters:
+        title: Filter work packages
+        baseline_incompatible: This filter attribute is not taken into consideration in Baseline mode.
+        baseline_warning: Baseline mode is on but some of your active filters are not included in the comparison.
+      inline_create:
+        title: Click here to add a new work package to this list
+      create:
+        title: New work package
+        header: New %{type}
+        header_no_type: New work package (Type not yet set)
+        header_with_parent: 'New %{type} (Child of %{parent_type} #%{id})'
+        button: Create
+      duplicate:
+        title: Duplicate work package
+      hierarchy:
+        show: Show hierarchy mode
+        hide: Hide hierarchy mode
+        toggle_button: Click to toggle hierarchy mode.
+        leaf: Work package leaf at level %{level}.
+        children_collapsed: Hierarchy level %{level}, collapsed. Click to show the filtered children
+        children_expanded: Hierarchy level %{level}, expanded. Click to collapse the filtered children
+      faulty_query:
+        title: Work packages could not be loaded.
+        description: Your view is erroneous and could not be processed.
+      no_results:
+        title: No work packages to display.
+        description: Either none have been created or all work packages are filtered out.
+      limited_results: Only %{count} work packages can be shown in manual sorting mode. Please reduce the results by filtering, or switch to automatic sorting.
+      property_groups:
+        details: Details
+        people: People
+        estimatesAndTime: Estimates & Time
+        other: Other
+      properties:
+        assignee: Assignee
+        author: Author
+        createdAt: Created on
+        description: Description
+        date: Date
+        percentComplete: "% Complete"
+        percentCompleteAlternative: Progress
+        dueDate: Finish date
+        duration: Duration
+        spentTime: Spent time
+        category: Category
+        percentageDone: Percentage done
+        priority: Priority
+        projectName: Project
+        remainingWork: Remaining work
+        remainingWorkAlternative: Remaining hours
+        responsible: Responsible
+        startDate: Start date
+        status: Status
+        subject: Subject
+        subproject: Subproject
+        title: Title
+        type: Type
+        updatedAt: Updated on
+        versionName: Version
+        version: Version
+        work: Work
+        workAlternative: Estimated time
+        remainingTime: Remaining work
+      default_queries:
+        manually_sorted: New manually sorted query
+        latest_activity: Latest activity
+        created_by_me: Created by me
+        assigned_to_me: Assigned to me
+        recently_created: Recently created
+        all_open: All open
+        overdue: Overdue
+        summary: Summary
+        shared_with_users: Shared with users
+        shared_with_me: Shared with me
+      jump_marks:
+        pagination: Jump to table pagination
+        label_pagination: Click here to skip over the work packages table and go to pagination
+        content: Jump to content
+        label_content: Click here to skip over the menu and go to the content
+      placeholders:
+        default: "-"
+        date: Select date
+      query:
+        column_names: Columns
+        group_by: Group results by
+        group: Group by
+        group_by_disabled_by_hierarchy: Group by is disabled due to the hierarchy mode being active.
+        hierarchy_disabled_by_group_by: Hierarchy mode is disabled due to results being grouped by %{column}.
+        sort_ascending: Sort ascending
+        sort_descending: Sort descending
+        move_column_left: Move column left
+        move_column_right: Move column right
+        hide_column: Hide column
+        insert_columns: Insert columns
+        filters: Filters
+        display_sums: Display Sums
+        confirm_edit_cancel: Are you sure you want to cancel editing the name of this view? Title will be set back to previous value.
+        click_to_edit_query_name: Click to edit title of this view.
+        rename_query_placeholder: Name of this view
+        star_text: Mark this view as favorite and add to the saved views sidebar on the left.
+        public_text: 'Publish this view, allowing other users to access your view. Users with the ''Manage public views'' permission can modify or remove public query. This does not affect the visibility of work package results in that view and depending on their permissions, users may see different results.
+
+          '
+        errors:
+          unretrievable_query: Unable to retrieve view from URL
+          not_found: There is no such view
+          duplicate_query_title: Name of this view already exists. Change anyway?
+        text_no_results: No matching views were found.
+      reminders:
+        button_label: Set reminder
+        title:
+          new: Set a reminder
+          edit: Edit reminder
+        subtitle: You will receive a notification for this work package at the chosen time.
+        presets:
+          tomorrow: Tomorrow
+          three_days: In 3 days
+          week: In a week
+          month: In a month
+          custom: At a particular date/time
+      scheduling:
+        is_parent: The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates.
+        is_switched_from_manual_to_automatic: The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages.
+      sharing:
+        title: Share work package
+        show_all_users: Show all users with whom the work package has been shared with
+      table:
+        configure_button: Configure work package table
+        summary: Table with rows of work package and columns of work package attributes.
+        text_inline_edit: Most cells of this table are buttons that activate inline-editing functionality of that attribute.
+        text_sort_hint: With the links in the table headers you can sort, group, reorder, remove and add table columns.
+        text_select_hint: Select boxes should be opened with 'ALT' and arrow keys.
+      table_configuration:
+        button: Configure this work package table
+        choose_display_mode: Display work packages as
+        modal_title: Work package table configuration
+        embedded_tab_disabled: This configuration tab is not available for the embedded view you are editing.
+        default: default
+        display_settings: Display settings
+        default_mode: Flat list
+        hierarchy_mode: Hierarchy
+        hierarchy_hint: All filtered table results will be augmented with their ancestors. Hierarchies can be expanded and collapsed.
+        display_sums_hint: Display sums of all summable attributes in a row below the table results.
+        show_timeline_hint: Show an interactive gantt chart on the right side of the table. You can change its width by dragging the divider between table and gantt chart.
+        highlighting: Highlighting
+        highlighting_mode:
+          description: Highlight with color
+          none: No highlighting
+          inline: Highlighted attribute(s)
+          inline_all: All attributes
+          entire_row_by: Entire row by
+          status: Status
+          priority: Priority
+          type: Type
+        sorting_mode:
+          description: 'Chose the mode to sort your Work packages:'
+          automatic: Automatic
+          manually: Manually
+          warning: You will lose your previous sorting when activating the automatic sorting mode.
+        columns_help_text: Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them.
+        relation_filters:
+          filter_work_packages_by_relation_type: Filter work packages by relation type
+      tabs:
+        overview: Overview
+        activity: Activity
+        relations: Relations
+        watchers: Watchers
+        files: Files
+      time_relative:
+        days: days
+        weeks: weeks
+        months: months
+    toolbar:
+      settings:
+        configure_view: Configure view
+        columns: Columns
+        sort_by: Sort by
+        group_by: Group by
+        display_sums: Display sums
+        display_hierarchy: Display hierarchy
+        hide_hierarchy: Hide hierarchy
+        hide_sums: Hide sums
+        save: Save
+        save_as: Save as
+        export: Export
+        visibility_settings: Visibility settings
+        share_calendar: Subscribe to calendar
+        page_settings: Rename view
+        delete: Delete
+      filter: Filter
+      unselected_title: Work package
+      search_query_label: Search saved views
+    modals:
+      label_name: Name
+      label_delete_page: Delete current page
+      button_apply: Apply
+      button_save: Save
+      button_submit: Submit
+      button_cancel: Cancel
+      button_delete: Delete
+      form_submit:
+        title: Confirm to continue
+        text: Are you sure you want to perform this action?
+      destroy_time_entry:
+        title: Confirm deletion of time entry
+        text: Are you sure you want to delete the following time entry?
+    notice_no_results_to_display: No visible results to display.
+    notice_successful_create: Successful creation.
+    notice_successful_delete: Successful deletion.
+    notice_successful_update: Successful update.
+    notice_job_started: job started.
+    no_job_id: No job ID returned from server.
+    invalid_job_response: Invalid response from server.
+    notice_bad_request: Bad Request.
+    relations:
+      empty: No relation exists
+      remove: Remove relation
+    inplace:
+      button_edit: "%{attribute}: Edit"
+      button_save: "%{attribute}: Save"
+      button_cancel: "%{attribute}: Cancel"
+      button_save_all: Save
+      button_cancel_all: Cancel
+      link_formatting_help: Text formatting help
+      btn_preview_enable: Preview
+      btn_preview_disable: Disable preview
+      null_value_label: No value
+      clear_value_label: "-"
+      errors:
+        required: "%{field} cannot be empty"
+        number: "%{field} is not a valid number"
+        maxlength: "%{field} cannot contain more than %{maxLength} digit(s)"
+        minlength: "%{field} cannot contain less than %{minLength} digit(s)"
+        messages_on_field: 'This field is invalid: %{messages}'
+    error_could_not_resolve_version_name: Couldn't resolve version name
+    error_could_not_resolve_user_name: Couldn't resolve user name
+    error_attachment_upload: 'File failed to upload: %{error}'
+    error_attachment_upload_permission: You don't have the permission to upload files on this resource.
+    units:
+      workPackage:
+        one: work package
+        other: work packages
+      child_work_packages:
+        one: one child work package
+        other: "%{count} work package children"
+      hour_string: "%{hours} h"
+      hour:
+        one: 1 h
+        other: "%{count} h"
+        zero: 0 h
+      day:
+        one: 1 day
+        other: "%{count} days"
+        zero: 0 days
+      word:
+        one: 1 word
+        other: "%{count} words"
+    zen_mode:
+      button_activate: Activate zen mode
+      button_deactivate: Deactivate zen mode
+    global_search:
+      all_projects: In all projects
+      close_search: Close search
+      items_available: "%{count} items available"
+      direct_hit_available: Work package with exact ID found. Press Enter to open it.
+      current_project_and_all_descendants: In this project + subprojects
+      current_project: In this project
+      recently_viewed: Recently viewed
+      search_placeholder_expanded: Search work packages by subject, project, type, status or ID
+      title:
+        all_projects: all projects
+        project_and_subprojects: and all subprojects
+        search_for: Search for
+    views:
+      card: Cards
+      list: Table
+      timeline: Gantt
+    invite_user_modal:
+      invite: Invite
+      placeholder_add_tag: Create placeholder user
+    exclusion_info:
+      modal:
+        title: Status excluded from hierarchy totals
+        content: The status '%{status_name}' has been configured to be excluded from hierarchy totals of Work, Remaining work, and % Complete. The totals do not take this value into account.
+    favorite_projects:
+      no_results: You have no favorite projects
+      no_results_subtext: Add one or multiple projects as favorite through their overview or in a project list.
+    include_projects:
+      toggle_title: Include projects
+      title: Projects
+      clear_selection: Clear selection
+      apply: Apply
+      selected_filter:
+        all: All projects
+        selected: Only selected
+      search_placeholder: Search projects...
+      search_placeholder_favorites: Search favorites...
+      include_subprojects: Include all sub-projects
+      tooltip:
+        include_all_selected: Project already included since Include all sub-projects is enabled.
+        current_project: This is the current project you are in.
+        does_not_match_search: Project does not match the search criteria.
+      no_results: No project matches your search criteria.
+      no_favorite_results: No favorite project matches your search criteria.
+    include_workspaces:
+      search_placeholder: Search...
+      types:
+        program: Program
+        portfolio: Portfolio
+    baseline:
+      toggle_title: Baseline
+      clear: Clear
+      apply: Apply
+      header_description: Highlight changes made to this list since any point in the past.
+      show_changes_since: Show changes since
+      help_description: Reference time zone for the baseline.
+      time_description: 'In your local time: %{datetime}'
+      time: Time
+      from: From
+      to: To
+      drop_down:
+        none: "-"
+        yesterday: yesterday
+        last_working_day: last working day
+        last_week: last week
+        last_month: last month
+        a_specific_date: a specific date
+        between_two_specific_dates: between two specific dates
+      legends:
+        changes_since: Changes since
+        changes_between: Changes between
+        now_meets_filter_criteria: Now meets filter criteria
+        no_longer_meets_filter_criteria: No longer meets filter criteria
+        maintained_with_changes: Maintained with changes
+        in_your_timezone: 'In your local timezone:'
+      icon_tooltip:
+        added: Added to view within the comparison time period
+        removed: Removed from view within the comparison time period
+        changed: Maintained with modifications
+    forms:
+      submit_success_message: The form was successfully submitted
+      load_error_message: There was an error loading the form
+      validation_error_message: Please fix the errors present in the form
+      advanced_settings: Advanced settings
+    spot:
+      filter_chip:
+        remove: Remove
+      drop_modal:
+        focus_grab: This is a focus anchor for modals. Press shift+tab to go back to the modal trigger element.
+        close: Close modal
+    open_project_storage_modal:
+      waiting_title:
+        timeout: Timeout
+      waiting_subtitle:
+        network_off: There is a network problem.
+        network_on: Network is back. We are trying.
+    projects:
+      identifier_suggestion:
+        loading: Loading suggestion...
+        set_name_first: Please set the name first.
diff --git a/config/locales/crowdin/js-id.yml b/config/locales/crowdin/js-id.yml
index 292ae98be47..5ec2320e44f 100644
--- a/config/locales/crowdin/js-id.yml
+++ b/config/locales/crowdin/js-id.yml
@@ -202,16 +202,7 @@ id:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Isian kustom
-        inactive: Tidak aktif
-        drag_to_activate: Tarik field dari sini untuk mengaktifkkannya
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: Grup baru
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Disetel ulang ke kondisi bawaan
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -613,18 +604,6 @@ id:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Nama %{group} digunakan lebih dari satu kali. Nama grup harus unik.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Setel ulang konfigurasi formulir
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Informasi lebih lanjut
-        nevermind: Tidak masalah
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Catatan waktu
diff --git a/config/locales/crowdin/js-it.yml b/config/locales/crowdin/js-it.yml
index 510689b4e83..4df90362d67 100644
--- a/config/locales/crowdin/js-it.yml
+++ b/config/locales/crowdin/js-it.yml
@@ -202,16 +202,7 @@ it:
           text: "[Placeholder] Calendario incorporato"
     admin:
       type_form:
-        custom_field: Campo personalizzato
-        inactive: Inattivo
-        drag_to_activate: Trascina i campi da qui per attivarli
-        add_group: Aggiungi gruppo di attributi
-        add_table: Aggiungi la tabella dei pacchetti di lavoro correlati
         edit_query: Modifica query
-        new_group: Nuovo gruppo
-        delete_group: Elimina gruppo
-        remove_attribute: Rimuovi dal gruppo
-        reset_to_defaults: Ripristino predefinite
       working_days:
         calendar:
           empty_state_header: Giorni non lavorativi
@@ -614,18 +605,6 @@ it:
     breadcrumb: Percorso di navigazione
     text_data_lost: Tutti i dati inseriti andranno persi.
     text_user_wrote: "%{value} ha scritto:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Il nome %{group} è usato più di una volta. I nomi dei gruppi devono essere univoci.
-        error_no_table_configured: Si prega di configurare una tabella per %{group}.
-        reset_title: Reimposta la configurazione del modulo
-        confirm_reset: 'Attenzione: vuoi reimpostare la configurazione del modulo? Tutti gli attributi torneranno al loro gruppo predefinito e TUTTI i campi personalizzati verranno disattivati.
-
-          '
-        upgrade_to_ee: Passa all'edizione Enterprise in sede
-        upgrade_to_ee_text: Wow! Se hai bisogno di questa aggiunta sei un vero professionista! Ti andrebbe di aiutare noi sviluppatori OpenSource diventando un cliente dell'edizione Enterprise?
-        more_information: Altre informazioni
-        nevermind: Lascia stare
     time_entry:
       work_package_required: Richiede prima di selezionare una macro-attività.
       title: Registra l'orario effettuato
diff --git a/config/locales/crowdin/js-ja.yml b/config/locales/crowdin/js-ja.yml
index e92442dacf1..9393c58aefe 100644
--- a/config/locales/crowdin/js-ja.yml
+++ b/config/locales/crowdin/js-ja.yml
@@ -202,16 +202,7 @@ ja:
           text: "[Placeholder] 埋め込みカレンダー"
     admin:
       type_form:
-        custom_field: カスタムフィールド
-        inactive: 非アクティブ
-        drag_to_activate: ここからフィールドをドラッグして、有効にします
-        add_group: 属性グループを追加する
-        add_table: 関係するワークパッケージのテーブルを追加する
         edit_query: クエリの編集
-        new_group: 新規グループ
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: デフォルトに戻す
       working_days:
         calendar:
           empty_state_header: 休業日
@@ -613,18 +604,6 @@ ja:
     breadcrumb: パンくず
     text_data_lost: 入力されたデータはすべて失われる。
     text_user_wrote: "%{value} が書き込みました："
-    types:
-      attribute_groups:
-        error_duplicate_group_name: 名前 %{group} が複数回使用されています。グループ名は一意にする必要があります。
-        error_no_table_configured: "%{group} のテーブルを設定してください。"
-        reset_title: フォーム設定をリセット
-        confirm_reset: '警告：フォーム設定をリセットしてもよろしいですか？ これにより、属性がデフォルトのグループにリセットされ、すべてのカスタムフィールドが無効になります。   コンテキスト| リクエストコンテキスト
-
-          '
-        upgrade_to_ee: エンタープライズ・オンプレミス版へのアップグレード
-        upgrade_to_ee_text: すごい！このアドオンが必要なら、あなたはスーパープロです！エンタープライズ版のクライアントになって、私たちオープンソース開発者をサポートしていただけませんか？
-        more_information: 詳細情報
-        nevermind: 無視
     time_entry:
       work_package_required: 最初にワークパッケージを選択する必要があります。
       title: 時間を記録
diff --git a/config/locales/crowdin/js-ka.yml b/config/locales/crowdin/js-ka.yml
index 5d5a8338b65..ca5bd2a9c76 100644
--- a/config/locales/crowdin/js-ka.yml
+++ b/config/locales/crowdin/js-ka.yml
@@ -202,16 +202,7 @@ ka:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: მორგებადი ველი
-        inactive: არააქტიური
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: მოთხოვნის ჩასწორება
-        new_group: ახალი ჯგუფი
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ ka:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: გადავიფიქრე
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: ჟურნალში დროის ჩაწერა
diff --git a/config/locales/crowdin/js-kk.yml b/config/locales/crowdin/js-kk.yml
index 35baaecdaa8..f63063b483a 100644
--- a/config/locales/crowdin/js-kk.yml
+++ b/config/locales/crowdin/js-kk.yml
@@ -202,16 +202,7 @@ kk:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ kk:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-ko.yml b/config/locales/crowdin/js-ko.yml
index f7c1dfe2074..0988c768be6 100644
--- a/config/locales/crowdin/js-ko.yml
+++ b/config/locales/crowdin/js-ko.yml
@@ -202,16 +202,7 @@ ko:
           text: "[Placeholder] 포함 달력"
     admin:
       type_form:
-        custom_field: 사용자 정의 필드
-        inactive: 비활성화
-        drag_to_activate: 여기에서 필드를 끌어와서 활성화
-        add_group: 특성 그룹 추가
-        add_table: 관련 작업 패키지의 테이블 추가
         edit_query: 쿼리 편집
-        new_group: 새 그룹
-        delete_group: 그룹 삭제
-        remove_attribute: 그룹에서 제거
-        reset_to_defaults: 기본값으로 초기화
       working_days:
         calendar:
           empty_state_header: 휴무일
@@ -613,18 +604,6 @@ ko:
     breadcrumb: 이동 경로
     text_data_lost: 입력한 모든 데이터가 손실됩니다.
     text_user_wrote: "%{value}이(가) 작성함:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: "%{group} 이라는 그룹 이름은 한 번 이상 사용되었습니다. 그룹 이름은 중복될 수 없습니다."
-        error_no_table_configured: "%{group}에 대한 테이블을 구성하세요."
-        reset_title: 구성 양식 초기화
-        confirm_reset: '경고: 양식 구성을 재설정하시겠습니까? 그러면 특성이 기본 그룹으로 재설정되고, 모든 사용자 지정 필드가 비활성화됩니다.
-
-          '
-        upgrade_to_ee: Enterprise on-premises Edition으로 업그레이드
-        upgrade_to_ee_text: 와우! 만약 이 추가 기능이 필요하다면 여러분은 진짜 프로입니다! Enterprise Edition 고객이 되어서 OpenSource 개발자들을 지원할 생각이 있으신가요?
-        more_information: 더보기
-        nevermind: 신경쓰지 마세요
     time_entry:
       work_package_required: 먼저 작업 패키지를 선택해야 합니다.
       title: 작업시간 기록
diff --git a/config/locales/crowdin/js-lt.yml b/config/locales/crowdin/js-lt.yml
index a2123dcb83a..a923608bdec 100644
--- a/config/locales/crowdin/js-lt.yml
+++ b/config/locales/crowdin/js-lt.yml
@@ -202,16 +202,7 @@ lt:
           text: "[Placeholder] Įterptinis kalendorius"
     admin:
       type_form:
-        custom_field: Savas laukas
-        inactive: Neaktyvus
-        drag_to_activate: Vilkite laukelius iš čia, kad juos aktyvuotumėte
-        add_group: Pridėti atributų grupę
-        add_table: Pridėti susijusių darbų paketų lentelę
         edit_query: Keisti užklausą
-        new_group: Nauja grupė
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Atstatyti į numatytuosius
       working_days:
         calendar:
           empty_state_header: Nedarbo dienos
@@ -616,18 +607,6 @@ lt:
     breadcrumb: Susijusi informacija
     text_data_lost: Visa įvesta informacija bus prarasta.
     text_user_wrote: "%{value} parašė:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: "%{group} grupės pavadinimas naudotas daugiau nei kartą. Grupių pavadinimai privalo būti unikalūs."
-        error_no_table_configured: Prašome sukonfigūruoti lentelę, skirtą grupei %{group}.
-        reset_title: Atstatyti formos konfigūraciją
-        confirm_reset: 'Įspėjimas: Ar tikrai norite atstatyti pradinę formos konfigūraciją? Atributai bus perkelti į jų numatytąsias grupes ir VISUS savi laukeliai bus išjungti.
-
-          '
-        upgrade_to_ee: Patobulinkite į Enteprise vietinę versiją
-        upgrade_to_ee_text: Oho! Jei Jums reikia šio priedo, esate super pro! Ar nenorėtumėte paremti mus, OpenSource (atviro kodo) kūrėjus, tapdami Enterprise versijos klientu?
-        more_information: Daugiau informacijos
-        nevermind: Nesvarbu
     time_entry:
       work_package_required: Reikia pirma pasirinkti darbo paketą.
       title: Registruoti laiką
diff --git a/config/locales/crowdin/js-lv.yml b/config/locales/crowdin/js-lv.yml
index 1d0e6703022..7d0d4d9fc26 100644
--- a/config/locales/crowdin/js-lv.yml
+++ b/config/locales/crowdin/js-lv.yml
@@ -202,16 +202,7 @@ lv:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -615,18 +606,6 @@ lv:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-mn.yml b/config/locales/crowdin/js-mn.yml
index 14ec7f4832a..56420ec5830 100644
--- a/config/locales/crowdin/js-mn.yml
+++ b/config/locales/crowdin/js-mn.yml
@@ -202,16 +202,7 @@ mn:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ mn:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-ms.yml b/config/locales/crowdin/js-ms.yml
index 6de174f5ed9..a221617a04d 100644
--- a/config/locales/crowdin/js-ms.yml
+++ b/config/locales/crowdin/js-ms.yml
@@ -202,16 +202,7 @@ ms:
           text: "[Placeholder] Kalendar yang tersemat"
     admin:
       type_form:
-        custom_field: Ruang tersuai
-        inactive: Tidak aktif
-        drag_to_activate: Tarik ruangan dari sini untuk mengaktifkan mereka
-        add_group: Tambah kumpulan atribut
-        add_table: Tambah jadual pakej kerja yang berkaitan
         edit_query: Edit pertanyaan
-        new_group: Kumpulan baharu
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Set semula ke default
       working_days:
         calendar:
           empty_state_header: Hari tidak bekerja
@@ -613,18 +604,6 @@ ms:
     breadcrumb: Breadcrumb
     text_data_lost: Semua data yang dimasukkan akan hilang.
     text_user_wrote: "%{value} menulis:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Nama %{group} digunakan lebih dari sekali. Nama kumpulan mestilah unik.
-        error_no_table_configured: Sila konfigurasi jadual untuk %{group}.
-        reset_title: Set semula konfigurasi borang
-        confirm_reset: 'Amaran: Adakah anda pasti anda ingin set semula konfigurasi borang? Ini akan set semula atribut kumpulan asal mereka dan menyahdayakan SEMUA ruang tersuai.
-
-          '
-        upgrade_to_ee: Naik taraf edisi Enterprise di premis
-        upgrade_to_ee_text: Wah! Jika anda perlukan tambahan ini anda sungguh pro! Bolehkah anda menyokong kami, pembangun OpenProject, dengan menjadi pelanggan edisi Enterprise?
-        more_information: Maklumat lanjut
-        nevermind: Tidak mengapa
     time_entry:
       work_package_required: Memerlukan pemilihan pakej kerja dahulu.
       title: Masa log
diff --git a/config/locales/crowdin/js-ne.yml b/config/locales/crowdin/js-ne.yml
index 2cccded24bc..9c20079dc93 100644
--- a/config/locales/crowdin/js-ne.yml
+++ b/config/locales/crowdin/js-ne.yml
@@ -202,16 +202,7 @@ ne:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: सम्बन्धित कार्य प्याकेजहरूको तालिका थप्नुहोस्
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ ne:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: सबै भन्दा पहिले कार्य प्याकेज चयन गर्न आवश्यक छ।
       title: Log time
diff --git a/config/locales/crowdin/js-nl.yml b/config/locales/crowdin/js-nl.yml
index ec460500b61..2f4666e8d4f 100644
--- a/config/locales/crowdin/js-nl.yml
+++ b/config/locales/crowdin/js-nl.yml
@@ -202,16 +202,7 @@ nl:
           text: "[Placeholder] ingesloten kalender"
     admin:
       type_form:
-        custom_field: Aangepast veld
-        inactive: Inactief
-        drag_to_activate: Sleep velden uit hier om ze te activeren
-        add_group: Toevoegen van nieuwe attribuutgroepen
-        add_table: Tabel van verwante werkpakketten toevoegen
         edit_query: Zoekopdracht bewerken
-        new_group: Nieuwe groep
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Standaardinstellingen herstellen
       working_days:
         calendar:
           empty_state_header: Vrije dagen
@@ -614,18 +605,6 @@ nl:
     breadcrumb: Breadcrumb
     text_data_lost: Alle ingevoerde gegevens zullen verloren gaan.
     text_user_wrote: "%{value} schreef:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: De groep naam %{group} word meer dan één keer gebruikt. Groep namen moeten uniek zijn.
-        error_no_table_configured: Gelieve een tabel voor %{group} instellen.
-        reset_title: Reset formulier configuratie
-        confirm_reset: 'Waarschuwing: Weet u zeker dat u de configuratie van het formulier wilt herstellen? Dit herstelt de kenmerken hun standaardgroep, deselecteerd de selectievakjes van de zichtbaarheid, en schakeld alle aangepaste velden uit.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Meer informatie
-        nevermind: Geen aandacht
     time_entry:
       work_package_required: Vereist eerst een werkpakket te selecteren.
       title: Gelogde tijd
diff --git a/config/locales/crowdin/js-no.yml b/config/locales/crowdin/js-no.yml
index 5595dae373e..7bf04e6a5af 100644
--- a/config/locales/crowdin/js-no.yml
+++ b/config/locales/crowdin/js-no.yml
@@ -202,16 +202,7 @@
           text: "[Placeholder] Innbygget kalender"
     admin:
       type_form:
-        custom_field: Egendefinert felt
-        inactive: Inaktiv
-        drag_to_activate: Dra feltene herfra for å aktivere dem
-        add_group: Legg til egenskapsgruppe
-        add_table: Legg til tabell over tilknyttede arbeidspakker
         edit_query: Rediger spørring
-        new_group: Ny gruppe
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Tilbakestill til standard
       working_days:
         calendar:
           empty_state_header: Arbeidsfrie dager
@@ -614,18 +605,6 @@
     breadcrumb: Brødsmule
     text_data_lost: Alle angitte data vil gå tapt.
     text_user_wrote: "%{value} skrev:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Navnet %{group} brukes flere ganger. Gruppenavn må være unike.
-        error_no_table_configured: Vennligst konfigurer en tabell for %{group}.
-        reset_title: Tilbakestill konfigurasjon for skjema
-        confirm_reset: 'Advarsel: Er du sikker på at du vil tilbakestille skjemakonfigurasjonen? Dette vil tilbakestille egenskaper til deres standard gruppe og deaktivere ALLE egendefinerte felt.
-
-          '
-        upgrade_to_ee: Oppgradere til Enterprise on-premises-utgave
-        upgrade_to_ee_text: Wow! Hvis du trenger dette tillegget er en superpro! Vil du støtte oss OpenSource-utviklere ved å bli en Enterpris-utgave-kunde?
-        more_information: Mer informasjon
-        nevermind: Glem det
     time_entry:
       work_package_required: Valg av arbeidspakke er påkrevd
       title: Logg tid
diff --git a/config/locales/crowdin/js-pl.yml b/config/locales/crowdin/js-pl.yml
index c77d8f5a2f7..0dcd8728f70 100644
--- a/config/locales/crowdin/js-pl.yml
+++ b/config/locales/crowdin/js-pl.yml
@@ -202,16 +202,7 @@ pl:
           text: "[Placeholder] Wbudowany kalendarz"
     admin:
       type_form:
-        custom_field: Pola niestandardowe
-        inactive: Nieaktywny
-        drag_to_activate: Aby aktywować pola, przeciągaj je stąd
-        add_group: Dodaj grupę atrybutów
-        add_table: Dodaj tabelę powiązanych pakietów roboczych
         edit_query: Edytuj zapytanie
-        new_group: Nowa Grupa
-        delete_group: Usuń grupę
-        remove_attribute: Usuń z grupy
-        reset_to_defaults: Resetuj do ustawień domyślnych
       working_days:
         calendar:
           empty_state_header: Dni nierobocze
@@ -616,18 +607,6 @@ pl:
     breadcrumb: Ścieżka
     text_data_lost: Wszystkie wprowadzone dane zostaną utracone.
     text_user_wrote: "%{value} napisał(a):"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Nazwa  %{group} jest użyta więcej niż raz. Nazwy grup muszą być unikalne.
-        error_no_table_configured: Skonfiguruj tabelę grupy %{group}.
-        reset_title: Zresetuj konfigurację formularza
-        confirm_reset: 'Ostrzeżenie: czy na pewno chcesz zresetować konfigurację formularza? Przywróci to atrybuty do ich grupy domyślnej i wyłączy WSZYSTKIE pola niestandardowe.
-
-          '
-        upgrade_to_ee: Zaktualizuj do wersji Enterprise On-Premises
-        upgrade_to_ee_text: Znakomicie! Jeśli potrzebujesz tego dodatku, jesteś superprofesjonalistą! Może wesprzesz nas jako deweloperów OpenSource, zostając nabywcą wersji Enterprise?
-        more_information: Więcej informacji
-        nevermind: Nieważne
     time_entry:
       work_package_required: Wymaga wybrania najpierw pakietu roboczego.
       title: Rejestruj czas pracy
diff --git a/config/locales/crowdin/js-pt-BR.yml b/config/locales/crowdin/js-pt-BR.yml
index 4a4c43597f3..2b7c5e356ea 100644
--- a/config/locales/crowdin/js-pt-BR.yml
+++ b/config/locales/crowdin/js-pt-BR.yml
@@ -202,16 +202,7 @@ pt-BR:
           text: "[Marcador de posição] Calendário embutido"
     admin:
       type_form:
-        custom_field: Campo personalizado
-        inactive: Inativo
-        drag_to_activate: Arraste campos daqui para ativá-los
-        add_group: Adicionar grupo de atributo
-        add_table: Adicionar tabela de pacotes de trabalho relacionados
         edit_query: Editar consulta
-        new_group: Novo grupo
-        delete_group: Excluir grupo
-        remove_attribute: Remover do grupo
-        reset_to_defaults: Voltar à configuração original
       working_days:
         calendar:
           empty_state_header: Dias não úteis
@@ -614,18 +605,6 @@ pt-BR:
     breadcrumb: Trilha de navegação
     text_data_lost: Todos os dados inseridos serão perdidos.
     text_user_wrote: "%{value} escreveu:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: O nome %{group} foi usado mais de uma vez. Nomes de Grupos devem ser únicos.
-        error_no_table_configured: Por favor, configure uma tabela para %{group}.
-        reset_title: Voltar para a configuração padrão do formulário
-        confirm_reset: 'Aviso: Tem certeza de que deseja redefinir a configuração de formulário? Isto irá redefinir os atributos para o grupo padrão e desativar TODOS os campos personalizados.
-
-          '
-        upgrade_to_ee: Atualizar para a edição Enterprise local
-        upgrade_to_ee_text: Uau! Se você precisa deste complemento, é porque é um super profissional! Gostaria de mostrar seu suporte aos desenvolvedores de código aberto tornando-se um cliente da edição Enterprise?
-        more_information: Mais informações
-        nevermind: Deixa pra lá
     time_entry:
       work_package_required: É necessário selecionar primeiro um pacote de trabalho.
       title: Registro de tempo
diff --git a/config/locales/crowdin/js-pt-PT.yml b/config/locales/crowdin/js-pt-PT.yml
index 1703ba94717..1468b2381e7 100644
--- a/config/locales/crowdin/js-pt-PT.yml
+++ b/config/locales/crowdin/js-pt-PT.yml
@@ -202,16 +202,7 @@ pt-PT:
           text: "[Placeholder] Calendário embutido"
     admin:
       type_form:
-        custom_field: Campo personalizado
-        inactive: Inativo
-        drag_to_activate: Arraste campos daqui para ativá-los
-        add_group: Adicionar grupo de atributos
-        add_table: Adicionar tabela de pacotes de trabalho relacionados
         edit_query: Editar consulta
-        new_group: Novo Grupo
-        delete_group: Eliminar grupo
-        remove_attribute: Remover do grupo
-        reset_to_defaults: Repor predefinições
       working_days:
         calendar:
           empty_state_header: Dias não úteis
@@ -614,18 +605,6 @@ pt-PT:
     breadcrumb: Estrutural
     text_data_lost: Todos os dados inseridos serão perdidos.
     text_user_wrote: "%{value} escreveu:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: O nome %{group} é utilizado mais de uma vez. Os nomes de grupos têm de ser exclusivos.
-        error_no_table_configured: Por favor configure uma tabela para %{group}.
-        reset_title: Redefinir configuração do formulário
-        confirm_reset: 'Aviso: Tem a certeza que deseja redefinir a configuração de formulário? Isto irá redefinir os atributos para o grupo padrão e desativar TODOS os campos personalizados.
-
-          '
-        upgrade_to_ee: Aprimore para a edição Enterprise on-premises
-        upgrade_to_ee_text: Uau! Se precisa deste complemento é porque faz parte dos utilizadores especializados! Gostaria de apoiar os desenvolvedores de OpenSource tornando-se cliente da edição Enterprise?
-        more_information: Mais informação
-        nevermind: Não, obrigado
     time_entry:
       work_package_required: Requer que selecione um pacote de trabalho primeiro.
       title: Tempo de registro
diff --git a/config/locales/crowdin/js-ro.yml b/config/locales/crowdin/js-ro.yml
index 05b6cff6b0c..46f0c3973ff 100644
--- a/config/locales/crowdin/js-ro.yml
+++ b/config/locales/crowdin/js-ro.yml
@@ -202,16 +202,7 @@ ro:
           text: "[Placeholder] Tabelul pachetului de lucru inserat"
     admin:
       type_form:
-        custom_field: Câmp personalizat
-        inactive: Inactiv
-        drag_to_activate: Mutați câmpuri de aici pentru a le activa
-        add_group: Adaugă grup atribut
-        add_table: Adaugă pachet de lucru asociat
         edit_query: Editează interogare
-        new_group: Grupare nouă
-        delete_group: Șterge grup
-        remove_attribute: Elimină din grup
-        reset_to_defaults: Resetare AVATAR implicit
       working_days:
         calendar:
           empty_state_header: Zile nelucrătoare
@@ -615,18 +606,6 @@ ro:
     breadcrumb: Breadcrumb
     text_data_lost: Toate datele introduse vor fi pierdute.
     text_user_wrote: "%{value} a scris:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Numele %{group} este utilizat de mai multe ori. Fiecare grup trebuie să aibă un nume unic.
-        error_no_table_configured: Vă rugăm să configurați un tabel pentru %{group}.
-        reset_title: Resetare configurare formular
-        confirm_reset: 'Atenție: Ești sigur că vrei să resetați conjurația formularului? Această acțiune va reseta toate atributele înapoi la grupul implicit și va dezactiva TOATE câmpurile personalizate.
-
-          '
-        upgrade_to_ee: Actualizare la ediția Enterprise on-premise
-        upgrade_to_ee_text: Wow! Dacă ai nevoie de acest add-on ești un super profesionist! Vrei să ne sprijini pe noi, dezvoltatorii OpenSource, devenind client al ediției Enterprise?
-        more_information: Mai multe informatii
-        nevermind: Asta e...
     time_entry:
       work_package_required: Necesită să se selecteze mai întâi un pachet de lucru.
       title: Registru timp
diff --git a/config/locales/crowdin/js-ru.yml b/config/locales/crowdin/js-ru.yml
index 2420a7ae5af..76f0dfabfc1 100644
--- a/config/locales/crowdin/js-ru.yml
+++ b/config/locales/crowdin/js-ru.yml
@@ -202,16 +202,7 @@ ru:
           text: "[Placeholder] Встроенный календарь"
     admin:
       type_form:
-        custom_field: Настраиваемое поле
-        inactive: Неактивен
-        drag_to_activate: Чтобы включить поля, перетащите их отсюда
-        add_group: Добавить группу атрибутов
-        add_table: Добавить таблицу связанных пакетов работ
         edit_query: Редактировать запрос
-        new_group: Новая группа
-        delete_group: Удалить группу
-        remove_attribute: Удалить из группы
-        reset_to_defaults: Восстановить значения по умолчанию
       working_days:
         calendar:
           empty_state_header: Нерабочие дни
@@ -618,18 +609,6 @@ ru:
     breadcrumb: Навигационная цепочка
     text_data_lost: Все введенные данные будут потеряны.
     text_user_wrote: "%{value} написал:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Имя %{group} используется более одного раза. Имена групп должны быть уникальными.
-        error_no_table_configured: Пожалуйста, настройте таблицу для %{group}.
-        reset_title: Сбросить настройки формы
-        confirm_reset: 'Предупреждение: хотите сбросить форму? Это сбросит атрибуты к первоначальным значениям группы и запретит правку настраиваемых полей.
-
-          '
-        upgrade_to_ee: Обновление до корпоративной версии
-        upgrade_to_ee_text: Уууууууууу! Если вам нужен этот дополнение, то вы бы хотели поддержать нас разработчиков OpenSource, став клиентом корпоративной версии?
-        more_information: Больше информации
-        nevermind: Неважно
     time_entry:
       work_package_required: Сначала необходимо выбрать пакет работ.
       title: Журналировать время
diff --git a/config/locales/crowdin/js-rw.yml b/config/locales/crowdin/js-rw.yml
index f744ef2fc9f..e7a3f810ce2 100644
--- a/config/locales/crowdin/js-rw.yml
+++ b/config/locales/crowdin/js-rw.yml
@@ -202,16 +202,7 @@ rw:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ rw:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-si.yml b/config/locales/crowdin/js-si.yml
index 36836526eb9..fb18bcf1b2c 100644
--- a/config/locales/crowdin/js-si.yml
+++ b/config/locales/crowdin/js-si.yml
@@ -202,16 +202,7 @@ si:
           text: "[Placeholder] කාවැද්දූ දින දර්ශනය"
     admin:
       type_form:
-        custom_field: අභිරුචි ක්ෂේත්රය
-        inactive: අක්රිය
-        drag_to_activate: ඒවා සක්රිය කිරීම සඳහා මෙතැන් සිට ක්ෂේත්ර ඇදගෙන යන්න
-        add_group: ගුණාංග පිරිසක් එකතු කරන්න
-        add_table: අදාළ වැඩ පැකේජ වගුව එකතු කරන්න
         edit_query: විමසුම සංස්කරණය කරන්න
-        new_group: නව කණ්ඩායම
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: පැහැර හැරීම් නැවත සකසන්න
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ si:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} ලිවීය:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: "%{group} නම එක් වරකට වඩා භාවිතා වේ. කණ්ඩායම් නම් අද්විතීය විය යුතුය."
-        error_no_table_configured: කරුණාකර %{group}සඳහා වගුවක් වින්යාස කරන්න.
-        reset_title: ආකෘති වින්යාසය සකසන්න
-        confirm_reset: 'අවවාදයයි: ආකෘති වින්යාසය නැවත සැකසීමට ඔබට අවශ්යද? මෙය ඔවුන්ගේ පෙරනිමි කණ්ඩායමට ගුණාංග නැවත සකස් කර සියලුම අභිරුචි ක්ෂේත්ර අක්රීය කරනු ඇත.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: වැඩි විස්තර
-        nevermind: කිසි විටෙකත් මනස
     time_entry:
       work_package_required: පළමුව වැඩ පැකේජයක් තෝරා ගැනීම අවශ්ය වේ.
       title: ලොග් වේලාව
diff --git a/config/locales/crowdin/js-sk.yml b/config/locales/crowdin/js-sk.yml
index e2890e09f9b..ba10072e1c1 100644
--- a/config/locales/crowdin/js-sk.yml
+++ b/config/locales/crowdin/js-sk.yml
@@ -202,16 +202,7 @@ sk:
           text: "[Placeholder] Vložený kalendár"
     admin:
       type_form:
-        custom_field: Vlastné pole
-        inactive: Neaktívny
-        drag_to_activate: Potiahnite polia z tejto oblasti a aktivujte ich
-        add_group: Pridať skupinu vlastností
-        add_table: Pridajte tabuľku súvisiacich pracovných balíčkov
         edit_query: Edit query
-        new_group: Nová skupina
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Obnoviť predvolené
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -616,18 +607,6 @@ sk:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} napísal:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Názov skupiny %{group} sa používa viackrát. Názvy skupín musia byť jedinečné.
-        error_no_table_configured: Prosím nastavte tabuľku pre %{group}.
-        reset_title: Obnoviť konfiguráciu formulára
-        confirm_reset: 'Upozornenie: Naozaj chcete resetovať konfiguráciu formulára? Týmto sa obnovia atribúty na ich predvolenú skupinu a vypnú sa VŠETKY vlastné polia.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Viac informácií
-        nevermind: Nie ďakujem
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Zaprotokoluj čas
diff --git a/config/locales/crowdin/js-sl.yml b/config/locales/crowdin/js-sl.yml
index 0e95dc8ada6..207b3b9ad9f 100644
--- a/config/locales/crowdin/js-sl.yml
+++ b/config/locales/crowdin/js-sl.yml
@@ -202,16 +202,7 @@ sl:
           text: "[Placeholder] Vdelan koledar"
     admin:
       type_form:
-        custom_field: Polje po meri
-        inactive: Neaktiven
-        drag_to_activate: Povlecite polja od tod, da jih aktivirate
-        add_group: Dodajte skupino atributov
-        add_table: Dodajte tabelo povezanih delovnih paketov
         edit_query: Uredi poizvedbo
-        new_group: Nova skupina
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Ponastavi na privzete vrednosti
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -618,18 +609,6 @@ sl:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} je napisal(a):"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Ime skupine %{group} je že uporabljeno. Imena skupin morajo biti unikatna.
-        error_no_table_configured: Prosimo konfigurirajte tabelo za %{group}.
-        reset_title: Po nastavi iz konfiguracije
-        confirm_reset: 'Opozorilo: Ali ste prepričani, da želite po nastaviti formo konfiguracije? To bo ponastavilo atribute v njihovo privzeto skupino in onemogočilo vsa polja po meri.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: Več informacij
-        nevermind: Pozabi
     time_entry:
       work_package_required: Najprej izberite opravilo
       title: Beleži čas
diff --git a/config/locales/crowdin/js-sr.yml b/config/locales/crowdin/js-sr.yml
index eacac083a77..b0f356a983d 100644
--- a/config/locales/crowdin/js-sr.yml
+++ b/config/locales/crowdin/js-sr.yml
@@ -202,16 +202,7 @@ sr:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -615,18 +606,6 @@ sr:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-sv.yml b/config/locales/crowdin/js-sv.yml
index f1cc8a5607e..85a31f5dcf2 100644
--- a/config/locales/crowdin/js-sv.yml
+++ b/config/locales/crowdin/js-sv.yml
@@ -202,16 +202,7 @@ sv:
           text: "[Placeholder] Inbäddad kalender"
     admin:
       type_form:
-        custom_field: Anpassat fält
-        inactive: Inaktiv
-        drag_to_activate: Dra fält härifrån för att aktivera dom
-        add_group: Lägg till attributgrupp
-        add_table: Lägg till tabell med relaterade arbetspaket
         edit_query: Redigera fråga
-        new_group: Ny grupp
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Återställ standardinställningar
       working_days:
         calendar:
           empty_state_header: Arbetsfria dagar
@@ -614,18 +605,6 @@ sv:
     breadcrumb: Breadcrumb
     text_data_lost: Alla inmatade data kommer att gå förlorade.
     text_user_wrote: "%{value} skrev:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Namnet %{group} används redan. Gruppnamn måste vara unika.
-        error_no_table_configured: Konfigurera en tabell för %{group}.
-        reset_title: Återställ formulärinställningarna
-        confirm_reset: 'Varning: Är du säker på att du vill återställa formulärinställningarna? Detta kommer att återställa attributen till deras standardgrupper, avmarkera kryssrutorna för synlighet samt inaktivera samtliga anpassade fält.
-
-          '
-        upgrade_to_ee: Uppgradera till Enterprise on-premise-utgåva
-        upgrade_to_ee_text: Wow! Om du behöver det här tillägget är du ett superproffs! Skulle du kunna stödja oss OpenSource utvecklare genom att bli en klient till Enterprise utgåvan?
-        more_information: Mer information
-        nevermind: Det var inget
     time_entry:
       work_package_required: Kräver att man först väljer ett arbetspaket.
       title: Logga tid
diff --git a/config/locales/crowdin/js-th.yml b/config/locales/crowdin/js-th.yml
index e2492cae3d4..ff0e924007c 100644
--- a/config/locales/crowdin/js-th.yml
+++ b/config/locales/crowdin/js-th.yml
@@ -202,16 +202,7 @@ th:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: ฟิลด์ที่กำหนดเอง
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: กลุ่มใหม่
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -613,18 +604,6 @@ th:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} เขียนว่า:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: เวลาที่ถูกบันทึก
diff --git a/config/locales/crowdin/js-tr.yml b/config/locales/crowdin/js-tr.yml
index d368508ddd5..d7a2c519111 100644
--- a/config/locales/crowdin/js-tr.yml
+++ b/config/locales/crowdin/js-tr.yml
@@ -202,16 +202,7 @@ tr:
           text: "[Placeholder] Göümülü takvim"
     admin:
       type_form:
-        custom_field: Özel alan
-        inactive: Etkin değil
-        drag_to_activate: Alanları buraya sürükleyerek aktifleştirebilirsiniz
-        add_group: Özellik grubu ekle
-        add_table: Bağlantılı iş paketlerinin tablosunu ekle
         edit_query: Sorguyu düzenle
-        new_group: Yeni grup
-        delete_group: Grubu Sil
-        remove_attribute: Gruptan çıkar
-        reset_to_defaults: Varsayılanlara geri yükle
       working_days:
         calendar:
           empty_state_header: Çalışılmayan günler
@@ -614,18 +605,6 @@ tr:
     breadcrumb: Gezinti Menüsü
     text_data_lost: Girilen tüm veriler silinecek.
     text_user_wrote: "%{value} demiş ki:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: "%{group} ismi birden fazla kullanıldı. Grup isimleri eşsiz olmalıdır."
-        error_no_table_configured: Lütfen %{group} için bir tablo yapılandırın.
-        reset_title: Form ayarlarlarını sıfırlayın
-        confirm_reset: 'Uyarı: Form yapılandırmasını sıfırlamak istediğinizden emin misiniz? Bu, nitelikleri varsayılan gruplarına sıfırlar ve TÜM özel alanları devre dışı bırakır.
-
-          '
-        upgrade_to_ee: Enterprise on-premises edition'a yükseltin
-        upgrade_to_ee_text: Vay! Bu eklentiye ihtiyacınız varsa, siz bir süper profesyonelsiniz! Enterprise sürümü müşterisi olarak biz OpenSource geliştiricilerini destekler misiniz?
-        more_information: Daha fazla bilgi
-        nevermind: Boşver
     time_entry:
       work_package_required: Önce bir iş paketi seçilmesini gerektirir.
       title: Zaman kaydet
diff --git a/config/locales/crowdin/js-uk.yml b/config/locales/crowdin/js-uk.yml
index 2277c30f7f8..ba32fbd7f61 100644
--- a/config/locales/crowdin/js-uk.yml
+++ b/config/locales/crowdin/js-uk.yml
@@ -202,16 +202,7 @@ uk:
           text: "[Placeholder] вбудований календар"
     admin:
       type_form:
-        custom_field: Користувацьке поле
-        inactive: Неактивні
-        drag_to_activate: Перетягніть поля звідти, щоб активувати їх
-        add_group: Додати групу атрибутів
-        add_table: Додати таблицю пов'язаних пакетів робіт
         edit_query: Редагувати запит
-        new_group: Нова група
-        delete_group: Видалити групу
-        remove_attribute: Вилучити з групи
-        reset_to_defaults: Скинути на типові значення
       working_days:
         calendar:
           empty_state_header: Неробочі дні
@@ -616,18 +607,6 @@ uk:
     breadcrumb: Ланцюжок навігації
     text_data_lost: Усі введені дані буде втрачено.
     text_user_wrote: "%{value} написав(-ла):"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} використовується більше одного разу. Назви груп повинні бути унікальними.
-        error_no_table_configured: Please configure a table for %{group}
-        reset_title: Скидання конфігурації форми
-        confirm_reset: 'Попередження: Справді скинути конфігурацію форми? Це призведе до скидання атрибутів до групи за замовчуванням і вимкнення всіх користувацьких полів.
-
-          '
-        upgrade_to_ee: Перейти на локальну версію Enterprise
-        upgrade_to_ee_text: Оце так! Якщо вам потрібне це доповнення, ви справжній профі! Підтримайте розробників OpenSource, перейшовши на версію Enterprise!
-        more_information: Додаткові відомості
-        nevermind: Nevermind
     time_entry:
       work_package_required: Спочатку потрібно вибрати пакет робіт.
       title: Записування часу
diff --git a/config/locales/crowdin/js-uz.yml b/config/locales/crowdin/js-uz.yml
index 6fa739ffc6c..1b515a47bea 100644
--- a/config/locales/crowdin/js-uz.yml
+++ b/config/locales/crowdin/js-uz.yml
@@ -202,16 +202,7 @@ uz:
           text: "[Placeholder] Embedded calendar"
     admin:
       type_form:
-        custom_field: Custom field
-        inactive: Inactive
-        drag_to_activate: Drag fields from here to activate them
-        add_group: Add attribute group
-        add_table: Add table of related work packages
         edit_query: Edit query
-        new_group: New group
-        delete_group: Delete group
-        remove_attribute: Remove from group
-        reset_to_defaults: Reset to defaults
       working_days:
         calendar:
           empty_state_header: Non-working days
@@ -614,18 +605,6 @@ uz:
     breadcrumb: Breadcrumb
     text_data_lost: All entered data will be lost.
     text_user_wrote: "%{value} wrote:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: The name %{group} is used more than once. Group names must be unique.
-        error_no_table_configured: Please configure a table for %{group}.
-        reset_title: Reset form configuration
-        confirm_reset: 'Warning: Are you sure you want to reset the form configuration? This will reset the attributes to their default group and disable ALL custom fields.
-
-          '
-        upgrade_to_ee: Upgrade to Enterprise on-premises edition
-        upgrade_to_ee_text: Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?
-        more_information: More information
-        nevermind: Nevermind
     time_entry:
       work_package_required: Requires selecting a work package first.
       title: Log time
diff --git a/config/locales/crowdin/js-vi.yml b/config/locales/crowdin/js-vi.yml
index 4e34fc537bc..af19690a54a 100644
--- a/config/locales/crowdin/js-vi.yml
+++ b/config/locales/crowdin/js-vi.yml
@@ -202,16 +202,7 @@ vi:
           text: "[Placeholder] Lịch nhúng"
     admin:
       type_form:
-        custom_field: Tùy chỉnh mục
-        inactive: Không hoạt động
-        drag_to_activate: Kéo các trường từ đây để kích hoạt chúng
-        add_group: Thêm 1 nhóm thuộc tính
-        add_table: Thêm bảng các gói công việc liên quan
         edit_query: Chỉnh sửa truy vấn
-        new_group: Nhóm mới
-        delete_group: Xóa nhóm
-        remove_attribute: Xóa khỏi nhóm
-        reset_to_defaults: Đặt lại về mặc định
       working_days:
         calendar:
           empty_state_header: Những ngày không làm việc
@@ -613,18 +604,6 @@ vi:
     breadcrumb: vụn bánh mì
     text_data_lost: Tất cả dữ liệu đã nhập sẽ bị mất.
     text_user_wrote: "%{value} đã viết:"
-    types:
-      attribute_groups:
-        error_duplicate_group_name: Tên %{group} được sử dụng nhiều lần. Tên nhóm phải là duy nhất.
-        error_no_table_configured: Vui lòng định cấu hình bảng cho %{group}.
-        reset_title: Đặt lại cấu hình biểu mẫu
-        confirm_reset: 'Cảnh báo: Bạn có chắc chắn muốn đặt lại cấu hình biểu mẫu không? Điều này sẽ đặt lại các thuộc tính về nhóm mặc định của chúng và vô hiệu hóa TẤT CẢ các trường tùy chỉnh.
-
-          '
-        upgrade_to_ee: Nâng cấp lên phiên bản Enterprise tại chỗ
-        upgrade_to_ee_text: Ồ! Nếu bạn cần tiện ích bổ sung này thì bạn là một siêu chuyên nghiệp! Bạn có phiền khi hỗ trợ các nhà phát triển OpenSource của chúng tôi bằng cách trở thành khách hàng phiên bản Enterprise không?
-        more_information: Thêm thông tin
-        nevermind: bỏ qua
     time_entry:
       work_package_required: Yêu cầu chọn gói công việc trước tiên.
       title: Đăng nhập thời gian
diff --git a/config/locales/crowdin/js-zh-CN.yml b/config/locales/crowdin/js-zh-CN.yml
index 32f29d7f603..3a650dfddd5 100644
--- a/config/locales/crowdin/js-zh-CN.yml
+++ b/config/locales/crowdin/js-zh-CN.yml
@@ -202,16 +202,7 @@ zh-CN:
           text: "[Placeholder]嵌入式日历"
     admin:
       type_form:
-        custom_field: 自定义字段
-        inactive: 非活动
-        drag_to_activate: 从此处拖动字段将其激活
-        add_group: 增加属性组
-        add_table: 添加相关工作包表
         edit_query: 编辑查询
-        new_group: 新建组
-        delete_group: 删除群组
-        remove_attribute: 从群组中移除
-        reset_to_defaults: 重置为默认值
       working_days:
         calendar:
           empty_state_header: 非工作日
@@ -613,18 +604,6 @@ zh-CN:
     breadcrumb: 面包屑导航
     text_data_lost: 输入的所有数据将全部丢失。
     text_user_wrote: "%{value} 写道："
-    types:
-      attribute_groups:
-        error_duplicate_group_name: 名称 %{group} 已多次使用。组名不能重复。
-        error_no_table_configured: 请为 %{group} 配置一个表。
-        reset_title: 重置表单配置
-        confirm_reset: '警告：确定想要重置表单配置吗？这会将属性重置为它们的默认组，并禁用所有自定义字段。
-
-          '
-        upgrade_to_ee: 升级到本地部署的 Enterprise edition
-        upgrade_to_ee_text: 哇！如果您需要此插件，那么您是位超级行家！您是否考虑成为我们的企业版客户，以支持我们这些开源开发者？
-        more_information: 更多信息
-        nevermind: 我愿意
     time_entry:
       work_package_required: 需要先选择一个工作包。
       title: 记录时间
diff --git a/config/locales/crowdin/js-zh-TW.yml b/config/locales/crowdin/js-zh-TW.yml
index 58d066fc883..0f72de42aca 100644
--- a/config/locales/crowdin/js-zh-TW.yml
+++ b/config/locales/crowdin/js-zh-TW.yml
@@ -202,16 +202,7 @@ zh-TW:
           text: "[Placeholder] 嵌入式日曆"
     admin:
       type_form:
-        custom_field: 客製欄位
-        inactive: 未啟用
-        drag_to_activate: 從這裡拖曳欄位來啟用它們
-        add_group: 增加群組屬性
-        add_table: 新增相關工作套件表格
         edit_query: 編輯查詢
-        new_group: 新增群組
-        delete_group: 刪除群組
-        remove_attribute: 從群組中移除
-        reset_to_defaults: 重設為預設值
       working_days:
         calendar:
           empty_state_header: 非工作日
@@ -613,18 +604,6 @@ zh-TW:
     breadcrumb: 導覽軌跡
     text_data_lost: 所有資料將遺失
     text_user_wrote: "%{value} 寫道："
-    types:
-      attribute_groups:
-        error_duplicate_group_name: 名稱 %{group} 已被使用，群組名稱不可重複。
-        error_no_table_configured: 請為 %{group} 配置表。
-        reset_title: 重設表單配置
-        confirm_reset: '警告: 確實要重置表單配置嗎？這將重置屬性到其預設組, 並禁用所有客製欄位。
-
-          '
-        upgrade_to_ee: 升級至地端企業版
-        upgrade_to_ee_text: 哇！如果您需要使用此功能，說明您非常專業！您是否願意成為企業版客戶來支持 OpenSource 開發人員？
-        more_information: 更多資訊
-        nevermind: 無視
     time_entry:
       work_package_required: 需要先選擇一個工作套件。
       title: 工時紀錄
diff --git a/config/locales/crowdin/ka.yml b/config/locales/crowdin/ka.yml
index 28264b948a0..a9996c00add 100644
--- a/config/locales/crowdin/ka.yml
+++ b/config/locales/crowdin/ka.yml
@@ -1339,6 +1339,37 @@ ka:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: პროექტები
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ ka:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ ka:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ ka:
     one: 1 კომენტარი
     other: "%{count} comments"
     zero: კომენტარების გარეშე
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 ღიაა
     other: "%{count} ღია"
@@ -4752,13 +4787,6 @@ ka:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: შეტყობინებების დაწერა
diff --git a/config/locales/crowdin/kk.yml b/config/locales/crowdin/kk.yml
index 220a7fc50df..6c8dc522a11 100644
--- a/config/locales/crowdin/kk.yml
+++ b/config/locales/crowdin/kk.yml
@@ -1339,6 +1339,37 @@ kk:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ kk:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ kk:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ kk:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ kk:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml
index 4d47f37e2e2..6a0ed268df4 100644
--- a/config/locales/crowdin/ko.yml
+++ b/config/locales/crowdin/ko.yml
@@ -1319,6 +1319,37 @@ ko:
     edit:
       form_configuration:
         tab: 양식 구성
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: 프로젝트
         enable_all: 모든 프로젝트에 대해 활성화
@@ -1417,8 +1448,8 @@ ko:
     bulk_delete_dialog:
       title: "%{count}개 작업 패키지 삭제"
       heading: 이러한 작업 패키지 %{count}개를 영구적으로 삭제하시겠습니까?
-      description: '자식 및 모든 관련 데이터를 포함한 다음 작업 패키지가 영구적으로 삭제됩니다:'
-      description_with_children: '자식 작업 패키지를 포함한 다음 작업 패키지 및 모든 관련 데이터가 영구적으로 삭제됩니다:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: 본인은 선택한 모든 작업 패키지 및 해당 자식이 영구적으로 삭제됨을 확인합니다.
       cross_project_warning: '이러한 작업 패키지는 여러 프로젝트에 걸쳐 있습니다: %{projects}'
       children_label: '다음 자식도 삭제됩니다:'
@@ -2390,7 +2421,7 @@ ko:
               attribute_unknown_name: '잘못된 작업 패키지 특성이 사용되었습니다: %{attribute}'
               duplicate_group: "'%{group}'(이)라는 그룹 이름이 두 번 이상 사용되었습니다. 그룹 이름은 중복될 수 없습니다."
               query_invalid: 포함된 쿼리 '%{group}'이(가) 잘못되었습니다. %{details}
-              group_without_name: 명명되지 않은 그룹은 허용되지 않습니다.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: 필드 내의 특성이 하나 이상의 유효하지 않습니다. 특성을 수정한 후에 저장하세요.
         user:
@@ -4372,6 +4403,10 @@ ko:
     one: 1개 코멘트
     other: "%{count}개 코멘트"
     zero: 코멘트 없음
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1개 열림
     other: "%{count}개 열림"
@@ -4703,13 +4738,6 @@ ko:
       work_package_card_component:
         menu:
           label_actions: 작업 패키지 액션
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: 코멘트 추가
   permission_add_work_packages: 작업 패키지 추가
   permission_add_messages: 메시지 게시
diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml
index 39c14aef145..3b598befdb6 100644
--- a/config/locales/crowdin/lt.yml
+++ b/config/locales/crowdin/lt.yml
@@ -1374,6 +1374,37 @@ lt:
     edit:
       form_configuration:
         tab: Formos konfigūracija
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projektai
         enable_all: Enable for all projects
@@ -1478,8 +1509,8 @@ lt:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2457,7 +2488,7 @@ lt:
               attribute_unknown_name: 'Panaudotas netinkamas darbo paketo atributas: %{attribute}'
               duplicate_group: Grupės pavadinimas „%{group}“ panaudotas daugiau nei kartą. Grupių pavadinimai turi būti unikalūs.
               query_invalid: 'Įsiūta užklausa „%{group}“ yra netinkama: %{details}'
-              group_without_name: Bevardės grupės nėra leidžiamos.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4547,6 +4578,10 @@ lt:
     one: 1 komentaras
     other: "%{count} komentarai (-as, -ų)"
     zero: nėra komentarų
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 atidarytas
     other: "%{count} atidaryti (-as, -ų)"
@@ -4891,13 +4926,6 @@ lt:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Pridėti darbų paketų
   permission_add_messages: Skelbti pranešimus
diff --git a/config/locales/crowdin/lv.yml b/config/locales/crowdin/lv.yml
index 4755d9727d4..1838878c2d1 100644
--- a/config/locales/crowdin/lv.yml
+++ b/config/locales/crowdin/lv.yml
@@ -1357,6 +1357,37 @@ lv:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekti
         enable_all: Enable for all projects
@@ -1459,8 +1490,8 @@ lv:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2436,7 +2467,7 @@ lv:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4484,6 +4515,10 @@ lv:
     one: 1 komentārs
     other: "%{count} komentāri"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 atvērts
     other: "%{count} atvērti"
@@ -4821,13 +4856,6 @@ lv:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/mn.yml b/config/locales/crowdin/mn.yml
index 1be80178057..a473783d5b8 100644
--- a/config/locales/crowdin/mn.yml
+++ b/config/locales/crowdin/mn.yml
@@ -1339,6 +1339,37 @@ mn:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ mn:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ mn:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ mn:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ mn:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/ms.yml b/config/locales/crowdin/ms.yml
index ea13fdf97c0..7f0cc4bba6a 100644
--- a/config/locales/crowdin/ms.yml
+++ b/config/locales/crowdin/ms.yml
@@ -1319,6 +1319,37 @@ ms:
     edit:
       form_configuration:
         tab: Konfigurasi borang
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projek-projek
         enable_all: Enable for all projects
@@ -1417,8 +1448,8 @@ ms:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2392,7 +2423,7 @@ ms:
               attribute_unknown_name: 'Atribut pakej kerja tidak sah digunakan: %{attribute}'
               duplicate_group: Nama kumpulan '%{group}' digunakan lebih dari sekali. Nama kumpulan mestilah unik.
               query_invalid: 'Pencarian yang ditetapkan ''%{group}'' tidak sah: %{details}'
-              group_without_name: Kumpulan tanpa nama tidak dibenarkan.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4368,6 +4399,10 @@ ms:
     one: 1 komen
     other: "%{count} komen"
     zero: Tiada komen
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 dibuka
     other: "%{count} dibuka"
@@ -4695,13 +4730,6 @@ ms:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Tambah pakej kerja
   permission_add_messages: Pos mesej
diff --git a/config/locales/crowdin/ne.yml b/config/locales/crowdin/ne.yml
index 8e5ada6144e..fc78a3c4788 100644
--- a/config/locales/crowdin/ne.yml
+++ b/config/locales/crowdin/ne.yml
@@ -1339,6 +1339,37 @@ ne:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ ne:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ ne:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ ne:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ ne:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/nl.yml b/config/locales/crowdin/nl.yml
index 30f62a2fbf2..03aec9ffb7d 100644
--- a/config/locales/crowdin/nl.yml
+++ b/config/locales/crowdin/nl.yml
@@ -1337,6 +1337,37 @@ nl:
     edit:
       form_configuration:
         tab: Formulierconfiguratie
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projecten
         enable_all: Enable for all projects
@@ -1437,8 +1468,8 @@ nl:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2412,7 +2443,7 @@ nl:
               attribute_unknown_name: 'Ongeldig werkpakket attribuut gebruikt: %{attribute}'
               duplicate_group: De groep naam ‘%{group}’ word meer dan één keer gebruikt. Groep namen moeten uniek zijn.
               query_invalid: 'De ingesloten zoekopdracht ''%{group}'' is ongeldig: %{details}'
-              group_without_name: Groepen zonder namen zijn niet toegestaan.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4416,6 +4447,10 @@ nl:
     one: 1 reactie
     other: "%{count} reacties"
     zero: geen reacties
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4746,13 +4781,6 @@ nl:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Werkpakketten toevoegen
   permission_add_messages: Berichten posten
diff --git a/config/locales/crowdin/no.yml b/config/locales/crowdin/no.yml
index 7fa8e29c1ad..0b9b04ef97f 100644
--- a/config/locales/crowdin/no.yml
+++ b/config/locales/crowdin/no.yml
@@ -1337,6 +1337,37 @@
     edit:
       form_configuration:
         tab: Skjema konfigurering
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Prosjekter
         enable_all: Enable for all projects
@@ -1437,8 +1468,8 @@
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2412,7 +2443,7 @@
               attribute_unknown_name: 'Ugyldig arbeidspakke-egenskap som brukes: %{attribute}'
               duplicate_group: Gruppenavn '%{group}' brukes mer enn én gang. Gruppenavn må være unike.
               query_invalid: 'Den innebygde spørringen ''%{group}'' er ugyldig: %{details}'
-              group_without_name: Navnløs gruppe er ikke tillatt.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4418,6 +4449,10 @@
     one: 1 kommentar
     other: "%{count} kommentarer"
     zero: ingen kommentarer
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 åpen
     other: "%{count} åpne"
@@ -4750,13 +4785,6 @@
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Legg til arbeidspakker
   permission_add_messages: Skriv meldinger
diff --git a/config/locales/crowdin/pl.yml b/config/locales/crowdin/pl.yml
index c2d159530de..21edf12d7a6 100644
--- a/config/locales/crowdin/pl.yml
+++ b/config/locales/crowdin/pl.yml
@@ -1373,6 +1373,37 @@ pl:
     edit:
       form_configuration:
         tab: Konfiguracja formularza
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekty
         enable_all: Włącz dla wszystkich projektów
@@ -1477,8 +1508,8 @@ pl:
     bulk_delete_dialog:
       title: Usuń pakiety robocze (%{count})
       heading: Czy usunąć trwale te pakiety robocze (%{count})?
-      description: 'Następujące pakiety robocze, w tym elementy podrzędne i wszystkie powiązane dane, zostaną trwale usunięte:'
-      description_with_children: 'Następujące pakiety robocze, w tym podrzędne pakiety robocze oraz wszystkie powiązane z nimi dane, zostaną trwale usunięte:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: Przyjmuję do wiadomości, że wszystkie wybrane pakiety robocze i ich elementy podrzędne zostaną trwale usunięte.
       cross_project_warning: 'Te pakiety robocze obejmują wiele projektów: %{projects}'
       children_label: 'Zostaną również usunięte następujące elementy podrzędne:'
@@ -2454,7 +2485,7 @@ pl:
               attribute_unknown_name: Użyto nieprawidłowego atrybutu pakietu roboczego. %{attribute}
               duplicate_group: Nazwy grupy %{group} użyto więcej niż raz. Nazwy grup muszą być niepowtarzalne.
               query_invalid: 'Osadzona kwerenda %{group} jest nieprawidłowowa: %{details}'
-              group_without_name: Grupy nienazwane nie są dozwolone.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Co najmniej jeden atrybut wewnątrz pola jest nieprawidłowy. Popraw atrybuty przed zapisaniem.
         user:
@@ -4540,6 +4571,10 @@ pl:
     one: 1 komentarz
     other: 'Liczba komentarzy: %{count}'
     zero: brak komentarzy
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 otwarty
     other: 'Liczba otwartych: %{count}'
@@ -4886,13 +4921,6 @@ pl:
       work_package_card_component:
         menu:
           label_actions: Działania pakietu roboczego
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Dodaj komentarze
   permission_add_work_packages: Dodawanie pakietów roboczych
   permission_add_messages: Wysyłanie wiadomości
diff --git a/config/locales/crowdin/pt-BR.yml b/config/locales/crowdin/pt-BR.yml
index 1d2d9793cdd..24fc82348e5 100644
--- a/config/locales/crowdin/pt-BR.yml
+++ b/config/locales/crowdin/pt-BR.yml
@@ -465,8 +465,8 @@ pt-BR:
         label: 'Função: %{role}'
         no_role: Selecionar função
         roles:
-          one: One role selected
-          other: "%{count} roles selected"
+          one: Uma função selecionada
+          other: "%{count} funções selecionadas"
       blankslate:
         title: Nenhuma transição de status configurada
         description: Adicione status para começar a configurar fluxos de trabalho para esta função
@@ -1336,6 +1336,37 @@ pt-BR:
     edit:
       form_configuration:
         tab: Configuração do formulário
+        label_group: Grupo
+        reset_to_defaults: Redefinir para os padrões
+        add_attribute_group: Adicionar grupo de atributo
+        add_query_group: Adicionar tabela de pacotes de trabalho relacionados
+        delete_group: Excluir grupo
+        remove_attribute: Remover do grupo
+        drag_to_activate: Arraste campos daqui para ativá-los
+        drag_to_reorder: Arraste para reordenar
+        edit_query: Editar consulta
+        custom_field: Campo personalizado
+        filter_inactive: Todos atributos
+        inactive_attributes_heading: Atributos inativos
+        no_inactive_attributes: Nenhum atributo inativo
+        blankslate_title: Nenhum grupo ainda
+        blankslate_description: Adicione grupos usando o botão acima ou arraste atributos do painel esquerdo.
+        group_actions: Ações de grupo
+        rename_group: Renomear grupo
+        confirm_delete_group: Tem certeza que deseja excluir este grupo? Esta ação não pode ser revertida automaticamente.
+        group_name_label: Nome do grupo
+        row_actions: Ações de linha
+        query_group_label: Tabela de pacotes de trabalho
+        empty_group_hint: Arraste atributos aqui
+        invalid_attribute_groups: O payload de configuração do formulário é inválido.
+        invalid_query: A configuração da consulta incorporada é inválida.
+        not_found: O item de configuração de formulário solicitado não foi encontrado.
+        untitled_group: Grupo sem título
+        reset_title: Redefinir a configuração do formulário
+        confirm_reset: Tem certeza de que deseja redefinir as configurações do formulário?
+        reset_description: 'Isto irá redefinir os atributos para seu grupo padrão e desativar TODOS os campos personalizados.
+
+          '
       projects:
         tab: Projetos
         enable_all: Habilitar para todos os projetos
@@ -1436,8 +1467,8 @@ pt-BR:
     bulk_delete_dialog:
       title: Excluir %{count} pacotes de trabalho
       heading: Excluir estes %{count} pacotes de trabalho de forma permanente?
-      description: 'Os seguintes pacotes de trabalho, incluindo os itens filhos e todos os dados associados, serão excluídos permanentemente:'
-      description_with_children: 'Os seguintes pacotes de trabalho, incluindo pacotes de trabalho filhos, e todos os dados associados serão excluídos permanentemente:'
+      description: 'Os seguintes pacotes de trabalho e todos os dados associados serão excluídos permanentemente:'
+      description_with_children: 'Os seguintes pacotes de trabalho, incluindo filhos e todos os dados associados, serão permanentemente excluídos:'
       confirm_children_deletion: Reconheço que todos os pacotes de trabalho selecionados e seus itens filhos serão excluídos permanentemente.
       cross_project_warning: 'Esses pacotes de trabalho abrangem vários projetos: %{projects}'
       children_label: 'Os seguintes itens filhos também serão excluídos:'
@@ -2411,7 +2442,7 @@ pt-BR:
               attribute_unknown_name: 'Atributo de pacote de trabalho inválido: %{attribute}'
               duplicate_group: O nome de grupo %{group} foi usado mais de uma vez. Nomes de grupos devem ser únicos.
               query_invalid: 'A consulta incorporada ''%{group}'' é inválida: %{details}'
-              group_without_name: Grupos sem nome não são permitidos.
+              group_without_name: O nome do grupo não pode estar em branco.
             patterns:
               invalid_tokens: Um ou mais atributos dentro do campo não são válidos. Corrija os atributos antes de salvar.
         user:
@@ -4417,6 +4448,10 @@ pt-BR:
     one: 1 comentário
     other: "%{count} comentários"
     zero: sem comentários
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 aberto
     other: "%{count} abertos"
@@ -4748,13 +4783,6 @@ pt-BR:
       work_package_card_component:
         menu:
           label_actions: Ações do pacote de trabalho
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Adicionar comentários
   permission_add_work_packages: Adicionar pacotes de trabalho
   permission_add_messages: Postar mensagens
@@ -5071,7 +5099,7 @@ pt-BR:
 
     '
   setting_after_login_default_redirect_url: Após redirecionamento de login
-  setting_after_login_default_redirect_url_example_html: 'Set a default path to redirect users after login, if no back link was provided. Redirects to home page if not set. <br/> Example: %{example_code}
+  setting_after_login_default_redirect_url_example_html: 'Defina um caminho padrão para redirecionar os usuários após o login, se nenhum link de retorno foi fornecido. Redireciona para a página inicial se não estiver definido. <br/> Exemplo: %{example_code}
 
     '
   setting_apiv3_cors_title: Compartilhamento de recursos entre origens (CORS)
diff --git a/config/locales/crowdin/pt-PT.yml b/config/locales/crowdin/pt-PT.yml
index 9d41ab50ccf..49b1d214297 100644
--- a/config/locales/crowdin/pt-PT.yml
+++ b/config/locales/crowdin/pt-PT.yml
@@ -1337,6 +1337,37 @@ pt-PT:
     edit:
       form_configuration:
         tab: Configuração do formulário
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projetos
         enable_all: Ativar para todos os projetos
@@ -1437,8 +1468,8 @@ pt-PT:
     bulk_delete_dialog:
       title: Eliminar %{count} pacotes de trabalho
       heading: Eliminar permanentemente estes %{count} pacotes de trabalho?
-      description: 'Os seguintes pacotes de trabalho, incluindo os secundários e todos os dados associados, serão permanentemente eliminados:'
-      description_with_children: 'Os seguintes pacotes de trabalho, incluindo os pacotes de trabalho secundários e todos os dados associados, serão permanentemente eliminados:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: Reconheço que todos os pacotes de trabalho selecionados e os seus filhos serão permanentemente eliminados.
       cross_project_warning: 'Estes pacotes de trabalho abrangem vários projetos: %{projects}'
       children_label: 'Os seguintes filhos também serão eliminados:'
@@ -2412,7 +2443,7 @@ pt-PT:
               attribute_unknown_name: 'Foi utilizado um atributo de pacote de trabalho inválido: %{attribute}'
               duplicate_group: O nome de grupo '%{group}' foi usado mais de uma vez. Os nomes de grupos têm de ser exclusivos.
               query_invalid: 'A consulta incorporada ''%{group}'' é inválida: %{details}'
-              group_without_name: Não são permitidos grupos sem nome.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Um ou mais atributos dentro do campo não são válidos. Corrija os atributos antes de os guardar.
         user:
@@ -4418,6 +4449,10 @@ pt-PT:
     one: 1 comentário
     other: "%{count} comentários"
     zero: sem comentários
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 aberto
     other: "%{count} abertos"
@@ -4747,13 +4782,6 @@ pt-PT:
       work_package_card_component:
         menu:
           label_actions: Ações do pacote de trabalho
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Adicionar comentários
   permission_add_work_packages: Adicionar pacotes de trabalho
   permission_add_messages: Publicar mensagens
diff --git a/config/locales/crowdin/ro.yml b/config/locales/crowdin/ro.yml
index 08e0dc98088..b1e78507664 100644
--- a/config/locales/crowdin/ro.yml
+++ b/config/locales/crowdin/ro.yml
@@ -1357,6 +1357,37 @@ ro:
     edit:
       form_configuration:
         tab: Configurare formular
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Proiecte
         enable_all: Activează pentru toate proiectele
@@ -1459,8 +1490,8 @@ ro:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2436,7 +2467,7 @@ ro:
               attribute_unknown_name: 'A fost utilizat un atribut de pachet de lucru nevalabil: %{attribute}'
               duplicate_group: Numele grupului "%{group}" este utilizat de mai multe ori. Numele grupurilor trebuie să fie unice.
               query_invalid: 'Interogarea încorporată "%{group}" nu este valabilă: %{details}'
-              group_without_name: Grupurile fără nume nu sunt permise.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4484,6 +4515,10 @@ ro:
     one: un comentariu
     other: "%{count} comentarii"
     zero: fara comentarii
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: unul deschis
     other: "%{count} deschise"
@@ -4823,13 +4858,6 @@ ro:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Adaugă pachete de lucru
   permission_add_messages: Publicare mesaje
diff --git a/config/locales/crowdin/ru.yml b/config/locales/crowdin/ru.yml
index fcd264a6712..44088e256a8 100644
--- a/config/locales/crowdin/ru.yml
+++ b/config/locales/crowdin/ru.yml
@@ -481,10 +481,10 @@ ru:
         label: 'Роль: %{role}'
         no_role: Выберите роль
         roles:
-          one: One role selected
-          few: "%{count} roles selected"
-          many: "%{count} roles selected"
-          other: "%{count} roles selected"
+          one: Выбрана одна роль
+          few: "%{count} роли выбрано"
+          many: "%{count} ролей выбрано"
+          other: "%{count} ролей выбрано"
       blankslate:
         title: Переходы статуса не настроены
         description: Добавьте статусы, чтобы начать настройку рабочих процессов для этой роли
@@ -732,7 +732,7 @@ ru:
       add_button: Добавить
     detail_blankslate:
       heading: Это подразделение не имеет дочерних подразделений
-      description: Add departments or users to create sub-items inside another one.
+      description: Добавить подразделения или пользователей для создания дочерних элементов.
       add_button: Добавить
     add_department_form:
       name_label: Наименование подразделения
@@ -1374,6 +1374,37 @@ ru:
     edit:
       form_configuration:
         tab: Настройка форм
+        label_group: Группа
+        reset_to_defaults: Восстановить значения по умолчанию
+        add_attribute_group: Добавить группу атрибутов
+        add_query_group: Добавить таблицу связанных пакетов работ
+        delete_group: Удалить группу
+        remove_attribute: Удалить из группы
+        drag_to_activate: Чтобы включить поля, перетащите их отсюда
+        drag_to_reorder: Перетащите, чтобы изменить порядок
+        edit_query: Редактировать представление
+        custom_field: Настраиваемое поле
+        filter_inactive: Фильтровать атрибуты
+        inactive_attributes_heading: Неактивные атрибуты
+        no_inactive_attributes: Нет неактивных атрибутов
+        blankslate_title: Нет групп
+        blankslate_description: Добавьте группы с помощью кнопки выше или перетащите атрибуты с левой панели.
+        group_actions: Действия с группами
+        rename_group: Переименовать группу
+        confirm_delete_group: Вы уверены, что хотите удалить эту группу? Это действие не может быть автоматически отменено.
+        group_name_label: Имя группы
+        row_actions: Действия со строками
+        query_group_label: Таблица пакетов работ
+        empty_group_hint: Перетащите атрибуты сюда
+        invalid_attribute_groups: Конфигурация формы является недопустимой.
+        invalid_query: Недопустимая конфигурация встраиваемого представления.
+        not_found: Запрашиваемый элемент конфигурации формы не найден.
+        untitled_group: Безымянная группа
+        reset_title: Сбросить настройки формы
+        confirm_reset: Вы уверены, что хотите сбросить конфигурацию формы?
+        reset_description: 'Это сбросит атрибуты к группе по умолчанию и отключит ВСЕ настраиваемые поля.
+
+          '
       projects:
         tab: Проекты
         enable_all: Использовать во всех проектах
@@ -1440,15 +1471,15 @@ ru:
         create:
           notice:
             one: Рабочий процесс успешно скопирован в роль '%{role_name}'.
-            few: Successfully copied workflow to %{count} roles.
-            many: Successfully copied workflow to %{count} roles.
+            few: Рабочий процесс успешно скопирован в %{count} ролей.
+            many: Рабочий процесс успешно скопирован в %{count} ролей.
             other: Рабочий процесс успешно скопирован в %{count} ролей.
       from_types:
         create:
           notice:
             one: Рабочий процесс успешно скопирован в тип '%{type_name}'.
-            few: Successfully copied workflow to %{count} types.
-            many: Successfully copied workflow to %{count} types.
+            few: Рабочий процесс успешно скопирован в %{count} типов.
+            many: Рабочий процесс успешно скопирован в %{count} типов.
             other: Рабочий процесс успешно скопирован в %{count} типов.
       new:
         title: Копировать рабочий процесс из типа "%{source_type}"
@@ -1480,8 +1511,8 @@ ru:
     bulk_delete_dialog:
       title: Удалить %{count} пакетов работ
       heading: Окончательно удалить эти %{count} пакеты работ?
-      description: 'Следующие рабочие пакеты, включая дочерние и все связанные с ними данные, будут навсегда удалены:'
-      description_with_children: 'Следующие рабочие пакеты, включая дочерние пакеты работ и все связанные с ними данные, будут навсегда удалены:'
+      description: 'Следующие пакеты работ и все связанные с ними данные будут окончательно удалены:'
+      description_with_children: 'Следующие пакеты работ и все связанные с ними данные будут окончательно удалены:'
       confirm_children_deletion: Я подтверждаю, что все выбранные пакеты работ, включая дочерние, будут удалены навсегда.
       cross_project_warning: 'Эти пакеты работ охватывают несколько проектов: %{projects}'
       children_label: 'Следующие дочерние пакеты работ также будут удалены:'
@@ -2061,7 +2092,7 @@ ru:
         views: Представления
         filters: Фильтры
         orders: Порядок
-        selects: Selects
+        selects: Выбирает
       persisted_view:
         name: Имя
         query: Запрос
@@ -2071,10 +2102,10 @@ ru:
         secondary_info: Дополнительная информация
         show_status_badge: Показать значок статуса
         show_email: Показать адрес эл. почты
-        tag_source: Tag source
-        tag_limit: Tag limit
+        tag_source: Источник тегов
+        tag_limit: Лимит тегов
         card_size: Размер карты
-        columns_per_row: Columns per row
+        columns_per_row: Столбцов в строке
     errors:
       messages:
         accepted: нужно подтвердить.
@@ -2461,7 +2492,7 @@ ru:
               attribute_unknown_name: 'Используется неверный атрибут пакета работ: %{attribute}'
               duplicate_group: Имя группы '%{group}' используется более одного раза. Имена групп должны быть уникальными.
               query_invalid: 'Встроенный запрос ''%{group}'' является недопустимым: %{details}'
-              group_without_name: Не именованные группы не допускаются.
+              group_without_name: Имя группы не может быть пустым.
             patterns:
               invalid_tokens: Один или несколько атрибутов внутри поля недействительны. Пожалуйста, исправьте атрибуты перед сохранением.
         user:
@@ -3553,26 +3584,26 @@ ru:
     report_component:
       checks:
         failures:
-          one: "%{count} check failed"
-          few: "%{count} checks failed"
-          many: "%{count} checks failed"
-          other: "%{count} checks failed"
-        success: All checks passed
+          one: "%{count} проверка не удалась"
+          few: "%{count} проверки не удалось"
+          many: "%{count} проверок не удалось"
+          other: "%{count} проверок не удалось"
+        success: Все проверки пройдены
         warnings:
-          one: "%{count} check returned a warning"
-          few: "%{count} checks returned a warning"
-          many: "%{count} checks returned a warning"
-          other: "%{count} checks returned a warning"
+          one: "%{count} проверка с предупреждением"
+          few: "%{count} проверки с предупреждением"
+          many: "%{count} проверок с предупреждением"
+          other: "%{count} проверок с предупреждением"
       summary:
-        failure: Some checks failed and the system does not work as expected.
-        success: All connections and systems are working as expected.
-        warning: Some checks returned a warning. This can lead to unexpected behaviour.
+        failure: Некоторые проверки не удались, и система не работает, как ожидалось.
+        success: Все соединения и системы работают, как и ожидалось.
+        warning: Некоторые проверки вернули предупреждение. Это может привести к неожиданному поведению.
     result_component:
       status:
-        failed: Failed
-        passed: Passed
-        skipped: Skipped
-        warning: Warning
+        failed: Ошибка
+        passed: Пройден
+        skipped: Пропущен
+        warning: Предупреждение
   homescreen:
     additional:
       projects: Новые видимые проекты в данном экземпляре.
@@ -3592,7 +3623,7 @@ ru:
             '
           new_features_list:
             line_0: Мигратор Jira с поддержкой базовых пользовательских полей.
-            line_1: Сегменты бэклога для структурирования и приоритизации пакетов работ во время уточнения бэклога.
+            line_1: Разделы бэклога для структурирования и приоритизации пакетов работ во время уточнения бэклога.
             line_2: Более удобное перетаскивание и улучшенные опции перемещения в Бэклогах.
             line_3: Кнопки начала и завершения спринта в заголовке спринта.
             line_4: Копирование настроек рабочего процесса между ролями.
@@ -4551,6 +4582,10 @@ ru:
     one: 1 комментарий
     other: "%{count} комментариев"
     zero: нет комментариев
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 открыт
     other: "%{count} открыто"
@@ -4891,13 +4926,6 @@ ru:
       work_package_card_component:
         menu:
           label_actions: Действия с пакетом работ
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Добавить комментарии
   permission_add_work_packages: Добавление пакетов работ
   permission_add_messages: Написать сообщения
@@ -5210,7 +5238,7 @@ ru:
 
     '
   setting_after_login_default_redirect_url: Перенаправление после входа
-  setting_after_login_default_redirect_url_example_html: 'Set a default path to redirect users after login, if no back link was provided. Redirects to home page if not set. <br/> Example: %{example_code}
+  setting_after_login_default_redirect_url_example_html: 'Установите путь по умолчанию для перенаправления пользователей после входа в систему, если обратная ссылка не была предоставлена. Если путь не задан, он перенаправляет на домашнюю страницу. <br/> Пример: %{example_code}
 
     '
   setting_apiv3_cors_title: Совместное использование ресурсов между источниками (Cross-Origin Resource Sharing, CORS)
@@ -6201,8 +6229,8 @@ ru:
       '
     confirm_revoke_my_application:
       one: Вы действительно хотите удалить это приложение? Это приведет к отзыву одного активного токена.
-      few: Do you really want to remove this application? This will revoke %{count} tokens active for it.
-      many: Do you really want to remove this application? This will revoke %{count} tokens active for it.
+      few: Вы действительно хотите удалить это приложение? Это приведет к отзыву %{count} активных токенов.
+      many: Вы действительно хотите удалить это приложение? Это приведет к отзыву %{count} активных токенов.
       other: Вы действительно хотите удалить это приложение? Это приведет к отзыву %{count} активных токенов.
     authorization_error: Произошла ошибка авторизации.
     my_registered_applications: Зарегистрированные OAuth приложения
diff --git a/config/locales/crowdin/rw.yml b/config/locales/crowdin/rw.yml
index c8759180351..9a31d12fed3 100644
--- a/config/locales/crowdin/rw.yml
+++ b/config/locales/crowdin/rw.yml
@@ -1339,6 +1339,37 @@ rw:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ rw:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ rw:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ rw:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ rw:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/si.yml b/config/locales/crowdin/si.yml
index 08a69deb866..dcc5af80a73 100644
--- a/config/locales/crowdin/si.yml
+++ b/config/locales/crowdin/si.yml
@@ -1339,6 +1339,37 @@ si:
     edit:
       form_configuration:
         tab: ආකෘති වින්යාසය
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: ව්‍යාපෘති
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ si:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ si:
               attribute_unknown_name: 'භාවිතා වලංගු නොවන වැඩ පැකේජ ගුණාංගය: %{attribute}'
               duplicate_group: කණ්ඩායම් නාමය '%{group}' එක් වරකට වඩා භාවිතා වේ. කණ්ඩායම් නම් අද්විතීය විය යුතුය.
               query_invalid: 'කාවැද්දූ විමසුම ''%{group}'' අවලංගුයි: %{details}'
-              group_without_name: නම් නොකළ කණ්ඩායම් වලට අවසර නැත.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ si:
     one: 1 අදහස්
     other: "%{count} අදහස්"
     zero: අදහස් නැත
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 විවෘත
     other: "%{count} විවෘත"
@@ -4752,13 +4787,6 @@ si:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: වැඩ පැකේජ එකතු කරන්න
   permission_add_messages: තැපැල් පණිවිඩ
diff --git a/config/locales/crowdin/sk.yml b/config/locales/crowdin/sk.yml
index 93043fd954f..db0386d38d5 100644
--- a/config/locales/crowdin/sk.yml
+++ b/config/locales/crowdin/sk.yml
@@ -1375,6 +1375,37 @@ sk:
     edit:
       form_configuration:
         tab: Konfigurácia formulára
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekty
         enable_all: Enable for all projects
@@ -1479,8 +1510,8 @@ sk:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2458,7 +2489,7 @@ sk:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: Názov skupiny '%{group}' sa používa viackrát. Názvy skupín musia byť jedinečné.
               query_invalid: 'Vložený dopyt ''%{group}'' je neplatný: %{details}'
-              group_without_name: Nepomenované skupiny nie sú povolené.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4546,6 +4577,10 @@ sk:
     one: 1 komentár
     other: "%{count} komentárov"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 otvorený
     other: "%{count} otvorených"
@@ -4890,13 +4925,6 @@ sk:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Pridať pracovné balíky
   permission_add_messages: Publikovať správy
diff --git a/config/locales/crowdin/sl.yml b/config/locales/crowdin/sl.yml
index c82eaa35f0d..dc51e64d163 100644
--- a/config/locales/crowdin/sl.yml
+++ b/config/locales/crowdin/sl.yml
@@ -1376,6 +1376,37 @@ sl:
     edit:
       form_configuration:
         tab: Konfiguracija obrazca
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekti
         enable_all: Enable for all projects
@@ -1480,8 +1511,8 @@ sl:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2463,7 +2494,7 @@ sl:
               attribute_unknown_name: 'Neveljaven atribut delovnega paketa je bil uporabljen: %{attribute}'
               duplicate_group: Ime skupine '%{group}' je uporabljeno več kot enkrat. Ime skupine mora biti unikatno.
               query_invalid: 'Poizvedba ''%{group}'' je neveljavna: %{details}'
-              group_without_name: Ne poimenovane skupine niso dovoljene.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4561,6 +4592,10 @@ sl:
     one: 1 komentar
     other: "%{count} komentarjev"
     zero: Ni komentarjev
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 odprt
     other: "%{count} odprtih"
@@ -4907,13 +4942,6 @@ sl:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Dodaj delovne pakete
   permission_add_messages: Objavi sporočila
diff --git a/config/locales/crowdin/sr.yml b/config/locales/crowdin/sr.yml
index 8e4d8b0539c..9ca52a4059e 100644
--- a/config/locales/crowdin/sr.yml
+++ b/config/locales/crowdin/sr.yml
@@ -1357,6 +1357,37 @@ sr:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1459,8 +1490,8 @@ sr:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2436,7 +2467,7 @@ sr:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4484,6 +4515,10 @@ sr:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4821,13 +4856,6 @@ sr:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/sv.yml b/config/locales/crowdin/sv.yml
index 9ee2bc9afbe..4a6836adeb2 100644
--- a/config/locales/crowdin/sv.yml
+++ b/config/locales/crowdin/sv.yml
@@ -1339,6 +1339,37 @@ sv:
     edit:
       form_configuration:
         tab: Ställ in formulär
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projekt
         enable_all: Aktivera för alla projekt
@@ -1439,8 +1470,8 @@ sv:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ sv:
               attribute_unknown_name: 'Ogiltigt attributet för arbetspaket används: %{attribute}'
               duplicate_group: Namnet %{group} används redan. Gruppnamn måste vara unika.
               query_invalid: 'Den inbäddade frågan ''%{group}'' är ogiltigt: %{details}'
-              group_without_name: Namnlösa grupper tillåts inte.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ sv:
     one: En kommentar
     other: "%{count} kommentarer"
     zero: inga kommentarer
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: en öppen
     other: "%{count} öppnade"
@@ -4750,13 +4785,6 @@ sv:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Lägg till kommentarer
   permission_add_work_packages: Lägg till arbetspaket
   permission_add_messages: Publicera meddelanden
diff --git a/config/locales/crowdin/th.yml b/config/locales/crowdin/th.yml
index 09825c3cee8..989d84ba9c8 100644
--- a/config/locales/crowdin/th.yml
+++ b/config/locales/crowdin/th.yml
@@ -1321,6 +1321,37 @@ th:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: โครงการ
         enable_all: Enable for all projects
@@ -1419,8 +1450,8 @@ th:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2392,7 +2423,7 @@ th:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4356,6 +4387,10 @@ th:
     one: 1 comment
     other: มี %{count} ความคิดเห็น
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: มี %{count} เปิดอยู่
@@ -4683,13 +4718,6 @@ th:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: เพิ่มลำดับภารกิจ
   permission_add_messages: โพสต์ข้อความ
diff --git a/config/locales/crowdin/tr.yml b/config/locales/crowdin/tr.yml
index e6bba2b5083..6718eb94b20 100644
--- a/config/locales/crowdin/tr.yml
+++ b/config/locales/crowdin/tr.yml
@@ -1340,6 +1340,37 @@ tr:
     edit:
       form_configuration:
         tab: Formu yapılandırma
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projeler
         enable_all: Tüm projeler için etkinleştir
@@ -1440,8 +1471,8 @@ tr:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2419,7 +2450,7 @@ tr:
               attribute_unknown_name: 'Geçersiz iş paketi özelliği kullanılmış: %{attribute}'
               duplicate_group: "'%{group}' grup adı, birden fazla kez kullanıldı. Grup isimleri benzersiz olmalıdır."
               query_invalid: 'Gömülü sorgu ''%{group}'' geçersiz: %{details}'
-              group_without_name: Adsız gruplara izin verilmez.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4425,6 +4456,10 @@ tr:
     one: 1 yorum
     other: "%{count} yorumlar"
     zero: yorum yok
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 açık
     other: "%{count} açık"
@@ -4756,13 +4791,6 @@ tr:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Yorum ekle
   permission_add_work_packages: İş paketi eklemek
   permission_add_messages: İleti göndermek
diff --git a/config/locales/crowdin/uk.yml b/config/locales/crowdin/uk.yml
index ff548d770fe..d9eb1ab87fe 100644
--- a/config/locales/crowdin/uk.yml
+++ b/config/locales/crowdin/uk.yml
@@ -1372,6 +1372,37 @@ uk:
     edit:
       form_configuration:
         tab: Конфігурація форми
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Проєкти
         enable_all: Використовувати у всіх проєктах
@@ -1476,8 +1507,8 @@ uk:
     bulk_delete_dialog:
       title: Видалити пакети робіт (%{count})
       heading: Видалити ці пакети робіт (%{count}) остаточно?
-      description: 'Наведені нижче пакети робіт, зокрема їх дочірні елементи й усі пов’язані дані, буде видалено назавжди:'
-      description_with_children: 'Наведені нижче пакети робіт, зокрема дочірні пакети робіт і всі пов’язані дані, буде видалено назавжди:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: Я усвідомлюю, що всі вибрані пакети робіт і їх дочірні елементи буде видалено назавжди.
       cross_project_warning: 'Ці пакети робіт використовуються в кількох проєктах: %{projects}'
       children_label: 'Також видаляться наведені нижче дочірні елементи:'
@@ -2457,7 +2488,7 @@ uk:
               attribute_unknown_name: Недійсний атрибут робочого пакета:%{attribute}
               duplicate_group: Назва групи %{group} використовується більше одного разу. Назви груп повинні бути унікальними.
               query_invalid: 'Вбудований запит %{group} недійсний: %{details}'
-              group_without_name: Неназвані групи не дозволені.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Один або кілька атрибутів усередині поля недійсні. Виправте їх, перш ніж зберігати.
         user:
@@ -4547,6 +4578,10 @@ uk:
     one: 1 коментар
     other: 'Коментарів: %{count}'
     zero: немає коментарів
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 відкрито
     other: 'Відкрито: %{count}'
@@ -4888,13 +4923,6 @@ uk:
       work_package_card_component:
         menu:
           label_actions: Дії з пакетом робіт
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Додавання коментарів
   permission_add_work_packages: Додати робочі пакети
   permission_add_messages: Відправка повідомлень
diff --git a/config/locales/crowdin/uz.yml b/config/locales/crowdin/uz.yml
index 922b1ffcda5..e716d1c52e0 100644
--- a/config/locales/crowdin/uz.yml
+++ b/config/locales/crowdin/uz.yml
@@ -1339,6 +1339,37 @@ uz:
     edit:
       form_configuration:
         tab: Form configuration
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1439,8 +1470,8 @@ uz:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2414,7 +2445,7 @@ uz:
               attribute_unknown_name: 'Invalid work package attribute used: %{attribute}'
               duplicate_group: The group name '%{group}' is used more than once. Group names must be unique.
               query_invalid: 'The embedded query ''%{group}'' is invalid: %{details}'
-              group_without_name: Unnamed groups are not allowed.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: One or more attributes inside the field are not valid. Please, fix the attributes before saving.
         user:
@@ -4420,6 +4451,10 @@ uz:
     one: 1 comment
     other: "%{count} comments"
     zero: no comments
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 open
     other: "%{count} open"
@@ -4752,13 +4787,6 @@ uz:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Add comments
   permission_add_work_packages: Add work packages
   permission_add_messages: Post messages
diff --git a/config/locales/crowdin/vi.yml b/config/locales/crowdin/vi.yml
index cc1939db72a..874473c0790 100644
--- a/config/locales/crowdin/vi.yml
+++ b/config/locales/crowdin/vi.yml
@@ -1323,6 +1323,37 @@ vi:
     edit:
       form_configuration:
         tab: Cấu hình biểu mẫu
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: dự án
         enable_all: Kích hoạt cho tất cả các dự án
@@ -1421,8 +1452,8 @@ vi:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2394,7 +2425,7 @@ vi:
               attribute_unknown_name: 'Thuộc tính gói công việc được sử dụng không hợp lệ: %{attribute}'
               duplicate_group: Nhóm tên '%{group}' được sử dụng nhiều hơn một lần. Tên nhóm phải là duy nhất.
               query_invalid: 'Truy vấn nhúng ''%{group}'' là không hợp lệ: %{details}'
-              group_without_name: Nhóm không có tên không được phép.
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: Một hoặc nhiều thuộc tính bên trong trường này không hợp lệ. Vui lòng sửa các thuộc tính trước khi lưu.
         user:
@@ -4358,6 +4389,10 @@ vi:
     one: 1 bình luận
     other: "%{count} bình luận"
     zero: Không có bình luận
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 mở
     other: "%{count} mở"
@@ -4693,13 +4728,6 @@ vi:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: Thêm nhận xét
   permission_add_work_packages: Thêm mới Gói công việc
   permission_add_messages: Đăng tin nhắn
diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml
index c0f9f4c9d8d..86e5d7fcc04 100644
--- a/config/locales/crowdin/zh-CN.yml
+++ b/config/locales/crowdin/zh-CN.yml
@@ -1317,6 +1317,37 @@ zh-CN:
     edit:
       form_configuration:
         tab: 表单配置
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: 项目
         enable_all: 对所有项目启用
@@ -1415,8 +1446,8 @@ zh-CN:
     bulk_delete_dialog:
       title: 删除 %{count} 个工作包
       heading: 永久删除这些 %{count} 工作包？
-      description: 以下工作包，包括子工作包和所有相关数据，将被永久删除：
-      description_with_children: 以下工作包（包括子工作包）和所有相关数据将被永久删除：
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: 我确认所有选定的工作包及其子工作包将被永久删除。
       cross_project_warning: 这些工作包跨越多个项目： %{projects}
       children_label: 以下子工作包也将被删除：
@@ -2388,7 +2419,7 @@ zh-CN:
               attribute_unknown_name: 使用了无效的工作包属性：%{attribute}
               duplicate_group: 组名 %{group} 已多次使用。组名不能重复。
               query_invalid: '嵌入式查询 "%{group}" 无效: %{details}'
-              group_without_name: 不允许未命名的组。
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: 字段内的一个或多个属性无效。请在保存前修正。
         user:
@@ -4352,6 +4383,10 @@ zh-CN:
     one: 1 条评论
     other: "%{count} 条评论"
     zero: 没有注释
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 个打开
     other: "%{count} 个打开"
@@ -4682,13 +4717,6 @@ zh-CN:
       work_package_card_component:
         menu:
           label_actions: 工作包操作
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: 添加评论
   permission_add_work_packages: 添加工作包
   permission_add_messages: 发布消息
diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml
index 875019d421b..a994241f5a4 100644
--- a/config/locales/crowdin/zh-TW.yml
+++ b/config/locales/crowdin/zh-TW.yml
@@ -1319,6 +1319,37 @@ zh-TW:
     edit:
       form_configuration:
         tab: 表單設置
+        label_group: Group
+        reset_to_defaults: Reset to defaults
+        add_attribute_group: Add attribute group
+        add_query_group: Add table of related work packages
+        delete_group: Delete group
+        remove_attribute: Remove from group
+        drag_to_activate: Drag fields from here to activate them
+        drag_to_reorder: Drag to reorder
+        edit_query: Edit query
+        custom_field: Custom field
+        filter_inactive: Filter attributes
+        inactive_attributes_heading: Inactive attributes
+        no_inactive_attributes: No inactive attributes
+        blankslate_title: No groups yet
+        blankslate_description: Add groups using the button above or drag attributes from the left panel.
+        group_actions: Group actions
+        rename_group: Rename group
+        confirm_delete_group: Are you sure you want to delete this group? This action cannot be automatically reversed.
+        group_name_label: Group name
+        row_actions: Row actions
+        query_group_label: Work packages table
+        empty_group_hint: Drag attributes here
+        invalid_attribute_groups: The form configuration payload is invalid.
+        invalid_query: The embedded query configuration is invalid.
+        not_found: The requested form configuration item could not be found.
+        untitled_group: Untitled group
+        reset_title: Reset form configuration
+        confirm_reset: Are you sure you want to reset the form configuration?
+        reset_description: 'This will reset the attributes to their default group and disable ALL custom fields.
+
+          '
       projects:
         tab: 專案
         enable_all: 在所有專案中啟用
@@ -1417,8 +1448,8 @@ zh-TW:
     bulk_delete_dialog:
       title: Delete %{count} work packages
       heading: Permanently delete these %{count} work packages?
-      description: 'The following work packages, including children and all associated data, will permanently be deleted:'
-      description_with_children: 'The following work packages, including child work packages, and all associated data will be permanently deleted:'
+      description: 'The following work packages and all associated data will be permanently deleted:'
+      description_with_children: 'The following work packages, including children and all associated data, will be permanently deleted:'
       confirm_children_deletion: I acknowledge that all selected work packages and their children will be permanently deleted.
       cross_project_warning: 'These work packages span multiple projects: %{projects}'
       children_label: 'The following children will also be deleted:'
@@ -2388,7 +2419,7 @@ zh-TW:
               attribute_unknown_name: '使用了無效的工作套件屬性: %{attribute}'
               duplicate_group: 群組名稱 %{group} 已被使用，群組名稱不可重複。
               query_invalid: '這個遷入的查詢 ''%{group}'' 是無效的: %{details}'
-              group_without_name: 不允許未命名的群組。
+              group_without_name: Group name can't be blank.
             patterns:
               invalid_tokens: 欄位內的一個或多個屬性不正確。請在儲存前修正屬性。
         user:
@@ -4350,6 +4381,10 @@ zh-TW:
     one: 1 則留言
     other: "%{count} 個留言"
     zero: 沒有留言
+  label_x_items:
+    one: 1 item
+    other: "%{count} items"
+    zero: no items
   label_x_open_work_packages_abbr:
     one: 1 開啟中
     other: "%{count} 個未完成"
@@ -4682,13 +4717,6 @@ zh-TW:
       work_package_card_component:
         menu:
           label_actions: Work package actions
-      work_package_card_list_component:
-        header:
-          label_actions: Open menu
-          label_work_package_count:
-            zero: No work packages
-            one: "%{count} work package"
-            other: "%{count} work packages"
   permission_add_work_package_comments: 增加留言
   permission_add_work_packages: 新增工作套件
   permission_add_messages: 張貼訊息
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 482b3031d11..59f407d2e24 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -136,7 +136,7 @@ en:
         title: "Beta - Try it out!"
         description: "This Jira Migrator is currently in beta. We currently only support Jira Server/Data Center versions 10.x and 11.x. Cloud instances are not supported at this time."
         contribution_callout: >
-          Please, help us improve the Jira Migrator with your feedback and private data donations. You can [join the development community](link) of the Jira Migrator. 
+          Please, help us improve the Jira Migrator with your feedback and private data donations. You can [join the development community](link) of the Jira Migrator.
         supported_versions: ""
       form:
         fields:
@@ -1407,6 +1407,36 @@ en:
     edit:
       form_configuration:
         tab: "Form configuration"
+        label_group: "Group"
+        reset_to_defaults: "Reset to defaults"
+        add_attribute_group: "Add attribute group"
+        add_query_group: "Add table of related work packages"
+        delete_group: "Delete group"
+        remove_attribute: "Remove from group"
+        drag_to_activate: "Drag fields from here to activate them"
+        drag_to_reorder: "Drag to reorder"
+        edit_query: "Edit query"
+        custom_field: "Custom field"
+        filter_inactive: "Filter attributes"
+        inactive_attributes_heading: "Inactive attributes"
+        no_inactive_attributes: "No inactive attributes"
+        blankslate_title: "No groups yet"
+        blankslate_description: "Add groups using the button above or drag attributes from the left panel."
+        group_actions: "Group actions"
+        rename_group: "Rename group"
+        confirm_delete_group: "Are you sure you want to delete this group? This action cannot be automatically reversed."
+        group_name_label: "Group name"
+        row_actions: "Row actions"
+        query_group_label: "Work packages table"
+        empty_group_hint: "Drag attributes here"
+        invalid_attribute_groups: "The form configuration payload is invalid."
+        invalid_query: "The embedded query configuration is invalid."
+        not_found: "The requested form configuration item could not be found."
+        untitled_group: "Untitled group"
+        reset_title: "Reset form configuration"
+        confirm_reset: "Are you sure you want to reset the form configuration?"
+        reset_description: >
+          This will reset the attributes to their default group and disable ALL custom fields.
       projects:
         tab: Projects
         enable_all: Enable for all projects
@@ -1513,8 +1543,8 @@ en:
     bulk_delete_dialog:
       title: "Delete %{count} work packages"
       heading: "Permanently delete these %{count} work packages?"
-      description: "The following work packages, including children and all associated data, will permanently be deleted:"
-      description_with_children: "The following work packages, including child work packages, and all associated data will be permanently deleted:"
+      description: "The following work packages and all associated data will be permanently deleted:"
+      description_with_children: "The following work packages, including children and all associated data, will be permanently deleted:"
       confirm_children_deletion: "I acknowledge that all selected work packages and their children will be permanently deleted."
       cross_project_warning: "These work packages span multiple projects: %{projects}"
       children_label: "The following children will also be deleted:"
@@ -2503,7 +2533,7 @@ en:
               attribute_unknown_name: "Invalid work package attribute used: %{attribute}"
               duplicate_group: "The group name '%{group}' is used more than once. Group names must be unique."
               query_invalid: "The embedded query '%{group}' is invalid: %{details}"
-              group_without_name: "Unnamed groups are not allowed."
+              group_without_name: "Group name can't be blank."
             patterns:
               invalid_tokens: "One or more attributes inside the field are not valid. Please, fix the attributes before saving."
         user:
@@ -4562,6 +4592,10 @@ en:
     one: "1 comment"
     other: "%{count} comments"
     zero: "no comments"
+  label_x_items:
+    one: "1 item"
+    other: "%{count} items"
+    zero: "no items"
   label_x_open_work_packages_abbr:
     one: "1 open"
     other: "%{count} open"
@@ -4907,13 +4941,6 @@ en:
         menu:
           label_actions: "Work package actions"
         parent: "Parent"
-      work_package_card_list_component:
-        header:
-          label_actions: "Open menu"
-          label_work_package_count:
-            zero: "No work packages"
-            one: "%{count} work package"
-            other: "%{count} work packages"
 
   permission_add_work_package_comments: "Add comments"
   permission_add_work_packages: "Add work packages"
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index 50545ecb125..ec5086e25d0 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -218,16 +218,7 @@ en:
 
     admin:
       type_form:
-        custom_field: "Custom field"
-        inactive: "Inactive"
-        drag_to_activate: "Drag fields from here to activate them"
-        add_group: "Add attribute group"
-        add_table: "Add table of related work packages"
         edit_query: "Edit query"
-        new_group: "New group"
-        delete_group: "Delete group"
-        remove_attribute: "Remove from group"
-        reset_to_defaults: "Reset to defaults"
 
       working_days:
         calendar:
@@ -658,19 +649,6 @@ en:
     text_data_lost: "All entered data will be lost."
     text_user_wrote: "%{value} wrote:"
 
-    types:
-      attribute_groups:
-        error_duplicate_group_name: "The name %{group} is used more than once. Group names must be unique."
-        error_no_table_configured: "Please configure a table for %{group}."
-        reset_title: "Reset form configuration"
-        confirm_reset: >
-          Warning: Are you sure you want to reset the form configuration?
-          This will reset the attributes to their default group and disable ALL custom fields.
-        upgrade_to_ee: "Upgrade to Enterprise on-premises edition"
-        upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
-        more_information: "More information"
-        nevermind: "Nevermind"
-
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
diff --git a/config/routes.rb b/config/routes.rb
index 0b53becfc63..7b965f99179 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -149,7 +149,27 @@ Rails.application.routes.draw do
   get "/roles/workflow/:id/:role_id/:type_id" => "roles#workflow"
 
   resources :types, module: "work_package_types", except: [:update] do
-    resource :form_configuration, only: %i[edit update], controller: "form_configuration_tab"
+    resource :form_configuration, only: %i[edit update], controller: "form_configuration_tab" do
+      get :reset_dialog
+      resources :groups, only: %i[create edit update destroy], controller: "form_configuration_groups_tab", param: :key do
+        collection do
+          post :add_group
+        end
+
+        member do
+          post :cancel_edit
+          put :drop
+          put :move
+          patch :update_query
+        end
+      end
+      resources :rows, only: %i[destroy], controller: "form_configuration_tab", param: :row_key do
+        member do
+          put :drop
+          put :move
+        end
+      end
+    end
     resource :projects, controller: "projects_tab", only: %i[update edit] do
       collection do
         post :enable_all, to: "projects_tab#enable_all_projects"
@@ -968,6 +988,9 @@ Rails.application.routes.draw do
   end
 
   resources :users, constraints: { id: /(\d+|me)/ }, except: :edit do
+    collection do
+      get :configure_view_modal
+    end
     resources :memberships, controller: "users/memberships", only: %i[update create destroy]
     resources :working_hours, controller: "users/working_hours", except: [:index]
     resources :non_working_times, controller: "users/non_working_times", except: [:index] do
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 6f13a27e083..1e6d1c509ee 100755
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -141,7 +141,7 @@ ENV PGDATA=/var/openproject/pgdata
 COPY --from=openproject/gosu /go/bin/gosu /usr/local/bin/gosu
 RUN chmod +x /usr/local/bin/gosu && gosu nobody true
 
-COPY --from=openproject/hocuspocus:17.3.1 --chown=$APP_USER:$APP_USER /app /opt/hocuspocus
+COPY --from=openproject/hocuspocus:17.4.0 --chown=$APP_USER:$APP_USER /app /opt/hocuspocus
 # Keep node/npm in all-in-one for bundled hocuspocus even when BIM support is disabled.
 COPY --from=build-base /usr/local/bin/node /usr/local/bin/node
 COPY --from=build-base /usr/local/lib/node_modules /usr/local/lib/node_modules
diff --git a/docker/prod/setup/precompile-assets.sh b/docker/prod/setup/precompile-assets.sh
index 1ab0388486f..b75b9b4de45 100755
--- a/docker/prod/setup/precompile-assets.sh
+++ b/docker/prod/setup/precompile-assets.sh
@@ -9,7 +9,7 @@ else
   echo "Assets need to be compiled"
   JOBS=8 npm install
 
-  SECRET_KEY_BASE=1 RAILS_ENV=production DATABASE_URL=nulldb://db \
+  SECRET_KEY_BASE="$(openssl rand -hex 64)" RAILS_ENV=production DATABASE_URL=nulldb://db \
     bin/rails openproject:plugins:register_frontend assets:precompile
 
   if [ "$DOCKER" = "1" ]; then
diff --git a/docs/api/apiv3/openapi-spec.yml b/docs/api/apiv3/openapi-spec.yml
index 2a50ea44013..8abeb68cf5f 100644
--- a/docs/api/apiv3/openapi-spec.yml
+++ b/docs/api/apiv3/openapi-spec.yml
@@ -70,7 +70,8 @@ info:
     This means you have to login to OpenProject via the Web-Interface to be authenticated in the API.
     This method is well-suited for clients acting within the browser, like the Angular-Client built into OpenProject.
 
-    In this case, you always need to pass the HTTP header `X-Requested-With "XMLHttpRequest"` for authentication.
+    Keep in mind that session-based authentication is only possible when accessing the API from the same origin. This
+    is assured by checking the `Sec-Fetch-Site` HTTP header.
 
     ### API token as bearer token
 
diff --git a/docs/development/profiling/README.md b/docs/development/profiling/README.md
index 9ee193abb75..7fe85d5743a 100644
--- a/docs/development/profiling/README.md
+++ b/docs/development/profiling/README.md
@@ -49,7 +49,7 @@ gem 'stackprof'
 Start thin via:
 
 ```shell
-SECRET_KEY_BASE='abcd' RAILS_ENV=production CUSTOM_PLUGIN_GEMFILE=gemfile.profiling OPENPROJECT_RACK_PROFILER_ENABLED=true thin start
+SECRET_KEY_BASE="$(openssl rand -hex 64)" RAILS_ENV=production CUSTOM_PLUGIN_GEMFILE=gemfile.profiling OPENPROJECT_RACK_PROFILER_ENABLED=true thin start
 ```
 
 ## Using the profiling tools
diff --git a/docs/installation-and-operations/configuration/incoming-emails/README.md b/docs/installation-and-operations/configuration/incoming-emails/README.md
index 4f3f68fd93d..251c15a4f41 100644
--- a/docs/installation-and-operations/configuration/incoming-emails/README.md
+++ b/docs/installation-and-operations/configuration/incoming-emails/README.md
@@ -164,7 +164,10 @@ If a matching account is found, the mail handler impersonates the user to create
 If no matching account is found, the mail is rejected. To override this behavior and allow unknown mail address
 to create work packages, set the option `no_permission_check=1` and specify with `unknown_user=accept`
 
-**Note**: This feature only provides a mapping of mail to user account, it does not authenticate the user based on the mail. Since you can easily spoof mail addresses, you should not rely on the authenticity of work packages created that way. At the moment in the OpenProject Enterprise cloud work package generation by emails can only be triggered by registered email addresses.
+> [!CAUTION]
+> This feature only provides a mapping of mail to user account, it does not authenticate the user based on the mail. Since you can easily spoof mail addresses, you should not rely on the authenticity of work packages created that way. At the moment in the OpenProject Enterprise cloud work package generation by emails can only be triggered by registered email addresses.
+>
+> The same is true for `unknown_user=create`. This will effectively allow users to create new accounts in the system, same as with the self registration setting.
 
 **Users with mail suffixes**
 
diff --git a/docs/installation-and-operations/installation/docker/README.md b/docs/installation-and-operations/installation/docker/README.md
index 15ae8029b2d..d447eff6385 100644
--- a/docs/installation-and-operations/installation/docker/README.md
+++ b/docs/installation-and-operations/installation/docker/README.md
@@ -71,7 +71,7 @@ following command:
 
 ```shell
 docker run -it -p 8080:80 \
-  -e SECRET_KEY_BASE=secret \
+  -e SECRET_KEY_BASE=<your-secret-key-base> \
   -e OPENPROJECT_HOST__NAME=localhost:8080 \
   -e OPENPROJECT_HTTPS=false \
   -e OPENPROJECT_DEFAULT__LANGUAGE=en \
@@ -81,7 +81,7 @@ docker run -it -p 8080:80 \
 Explanation of the used configuration values:
 
 - `-p 8080:80` binds the port 80 of the container to 8080 on the machine running docker.
-- `SECRET_KEY_BASE` sets the secret key base for Rails. Please use a pseudo-random value for this and treat it like a password.
+- `SECRET_KEY_BASE` sets the secret key base for Rails. Replace `<your-secret-key-base>` with a strong, random value (for example generated with `openssl rand -hex 64`). Treat it like a password and **store it securely** — the same value must be reused on every container start, otherwise existing sessions and encrypted database content become unreadable. OpenProject will refuse to start with a default or weak value.
 - `OPENPROJECT_HOST__NAME` sets the host name of the application. This value is used for generating forms and links in emails, and needs to match the external request host name (The value users are seeing in their browsers).
 - `OPENPROJECT_HTTPS=false` disables the on-by-default HTTPS mode of OpenProject so you can access the instance over HTTP-only. For all production systems we strongly advise not to set this to false, and instead set up a proper TLS/SSL termination on your outer web server.
 - `OPENPROJECT_DEFAULT__LANGUAGE` does two things. It controls for the very first installation, in which language basic data (such as types, status names, etc.) and demo data is being created in. It also sets the default fallback language for new users.
@@ -102,7 +102,7 @@ achieved with the `-d` flag:
 
 ```shell
 docker run -d -p 8080:80 \
-  -e SECRET_KEY_BASE=secret \
+  -e SECRET_KEY_BASE=<your-secret-key-base> \
   -e OPENPROJECT_HOST__NAME=localhost:8080 \
   -e OPENPROJECT_HTTPS=false \
   openproject/openproject:17
@@ -134,7 +134,7 @@ sudo mkdir -p /var/lib/openproject/{pgdata,assets}
 
 docker run -d -p 8080:80 --name openproject \
   -e OPENPROJECT_HOST__NAME=openproject.example.com \
-  -e SECRET_KEY_BASE=secret \
+  -e SECRET_KEY_BASE=<your-secret-key-base> \
   -v /var/lib/openproject/pgdata:/var/openproject/pgdata \
   -v /var/lib/openproject/assets:/var/openproject/assets \
   openproject/openproject:17
@@ -143,7 +143,7 @@ docker run -d -p 8080:80 --name openproject \
 Please make sure you set the correct public facing hostname in `OPENPROJECT_HOST__NAME`. If you don't have a load-balancing or proxying web server in front of your docker container,
 you will otherwise be vulnerable to [HOST header injections](https://portswigger.net/web-security/host-header), as the internal server has no way of identifying the correct host name. We strongly recommend you use an external load-balancing or proxying web server for termination of TLS/SSL and general security hardening.
 
-**Note**: Make sure to replace `secret` with a random string. One way to generate one is to run `head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32 ; echo ''` if you are on Linux.
+**Note**: Make sure to replace `<your-secret-key-base>` with a random string. One way to generate one is to run `openssl rand -hex 64`. Store this value securely — it must remain the same across container restarts, otherwise sessions and encrypted database content will be lost.
 
 **Note**: MacOS users might encounter an "Operation not permitted" error on the mounted directories. The fix for this is to create the two directories in a user-owned directory of the host machine.
 
@@ -474,7 +474,7 @@ The first way is to mount the root certificate via the ```--mount``` option into
 
 ```shell
 sudo docker run -it -p 8080:80 \
-  -e SECRET_KEY_BASE=secret \
+  -e SECRET_KEY_BASE=<your-secret-key-base> \
   -e OPENPROJECT_HOST__NAME=localhost:8080 \
   -e OPENPROJECT_HTTPS=false \
   -e OPENPROJECT_DEFAULT__LANGUAGE=en \
diff --git a/docs/installation-and-operations/jira-migration/README.md b/docs/installation-and-operations/jira-migration/README.md
index 25d3dc11de4..98e7c74b8f2 100644
--- a/docs/installation-and-operations/jira-migration/README.md
+++ b/docs/installation-and-operations/jira-migration/README.md
@@ -32,7 +32,7 @@ This import tool is currently in beta and can only import basic data:
 - Users (name, email, project membership)
 - Statuses
 - Types
-- Basic custom fields (see [Custom fields migration](./custom-fields/README.md))
+- Basic custom fields (see [Custom fields migration](./custom-fields/))
 
 ## Data not yet covered by the Migrator 
 
diff --git a/docs/installation-and-operations/jira-migration/custom-fields/README.md b/docs/installation-and-operations/jira-migration/custom-fields/README.md
index fe189a9433f..85b4c251919 100644
--- a/docs/installation-and-operations/jira-migration/custom-fields/README.md
+++ b/docs/installation-and-operations/jira-migration/custom-fields/README.md
@@ -34,8 +34,8 @@ The following Jira custom field types are imported:
 | Cascading select             | Hierarchy or List      | 
 | Labels                       | List                   | 
 
-Read more about [OpenProject custom field formats](../../../system-admin-guide/custom-fields/README.md#custom-field-formats) and 
-the [Hierarchy format](../../../system-admin-guide/custom-fields/README.md#hierarchy-custom-field-enterprise-add-on) in particular in the system administration guide.
+Read more about [OpenProject custom field formats](../../../system-admin-guide/custom-fields/#custom-field-formats) and 
+the [Hierarchy format](../../../system-admin-guide/custom-fields/#hierarchy-custom-field-enterprise-add-on) in particular in the system administration guide.
 
 ## Currently unsupported field types
 
diff --git a/docs/installation-and-operations/misc/migration-to-postgresql13/README.md b/docs/installation-and-operations/misc/migration-to-postgresql13/README.md
index 533361db10e..014c7c21d05 100644
--- a/docs/installation-and-operations/misc/migration-to-postgresql13/README.md
+++ b/docs/installation-and-operations/misc/migration-to-postgresql13/README.md
@@ -213,7 +213,7 @@ sudo mv /var/lib/openproject/pgdata-next /var/lib/openproject/pgdata
 
 Finally, you can restart OpenProject with the same command that you used before. For instance:
 
-docker run -d -p 8080:80 --name openproject -e SECRET_KEY_BASE=secret \
+docker run -d -p 8080:80 --name openproject -e SECRET_KEY_BASE=<your-secret-key-base> \
   -v /var/lib/openproject/pgdata:/var/openproject/pgdata \
   -v /var/lib/openproject/assets:/var/openproject/assets \
   [...]
diff --git a/docs/installation-and-operations/misc/migration-to-postgresql17/README.md b/docs/installation-and-operations/misc/migration-to-postgresql17/README.md
index b839d9f1829..dc32c2b5f4d 100644
--- a/docs/installation-and-operations/misc/migration-to-postgresql17/README.md
+++ b/docs/installation-and-operations/misc/migration-to-postgresql17/README.md
@@ -165,7 +165,7 @@ You can now run a new OpenProject container connected to your upgraded PostgreSQ
 ```bash
 docker run -d -p 8080:80 --name openproject \
   -e OPENPROJECT_HOST__NAME=openproject.example.com \
-  -e SECRET_KEY_BASE=secret \
+  -e SECRET_KEY_BASE=<your-secret-key-base> \
   -v /var/lib/openproject/pgdata17:/var/openproject/pgdata \
   -v /var/lib/openproject/assets:/var/openproject/assets \
   openproject/openproject:17
diff --git a/docs/installation-and-operations/operation/backing-up/README.md b/docs/installation-and-operations/operation/backing-up/README.md
index 9351f53c7e3..4e91cbce0fb 100644
--- a/docs/installation-and-operations/operation/backing-up/README.md
+++ b/docs/installation-and-operations/operation/backing-up/README.md
@@ -59,7 +59,7 @@ If you are using the all-in-one container, then you can simply backup any local
 ```shell
 sudo mkdir -p /var/lib/openproject/{pgdata,assets}
 
-docker run -d -p 8080:80 --name openproject -e SECRET_KEY_BASE=secret \
+docker run -d -p 8080:80 --name openproject -e SECRET_KEY_BASE=<your-secret-key-base> \
   -v /var/lib/openproject/pgdata:/var/openproject/pgdata \
   -v /var/lib/openproject/assets:/var/openproject/assets \
   openproject/openproject:17
diff --git a/docs/release-notes/17-2-4/README.md b/docs/release-notes/17-2-4/README.md
new file mode 100644
index 00000000000..0e42132707e
--- /dev/null
+++ b/docs/release-notes/17-2-4/README.md
@@ -0,0 +1,139 @@
+---
+title: OpenProject 17.2.4
+sidebar_navigation:
+    title: 17.2.4
+release_version: 17.2.4
+release_date: 2026-05-13
+---
+
+ # OpenProject 17.2.4
+
+ Release date: 2026-05-13
+
+ We released [OpenProject 17.2.4](https://community.openproject.org/versions/2300).
+ The release contains several bug fixes and we recommend updating to the newest version.
+ Below you will find a complete list of all changes and bug fixes.
+
+<!-- BEGIN CVE AUTOMATED SECTION -->
+
+## Security fixes
+
+
+
+### CVE-2026-46386 - Docker Container starts with SECRET_KEY_BASE default value
+
+When an attacker knew the secret key base that the application used to derive internal keys from, they could construct encrypted cookies that on the server side were decoded using [Object Marshalling](https://docs.ruby-lang.org/en/4.0/Marshal.html) which allowed the attacker to execute almost arbitrary ruby code within the container, up to a complete remote code execution. This was especially present in Docker containers that shipped with a default value as the secret key base, when it was not manually overwritten, as mentioned in the documentation.
+
+
+
+As a fix, the docker containers now validate that a proper `SECRET_KEY_BASE` environment variable is set Otherwise the application aborts the boot process with an error message. The documentation has been updated to make it even clearer, that the `SECRET_KEY_BASE` env variable must be set. And the decoding of the encrypted cookies has been updated to use JSON encoding instead of Object Marshalling.&nbsp;
+
+
+
+**Administrators that have not set a `SECRET_KEY_BASE` environment before need to set one now. Otherwise the application will not boot.**
+
+
+
+**This will force all users using 2 factor authentication to authenticate on their next login, even if they have saved a cookie to skip 2FA for the next 14 days.**
+
+
+
+This vulnerability was responsibly reported by GitHub user [hkolvenbach](https://github.com/hkolvenbach).
+
+
+
+For more information, please see the [GitHub advisory #GHSA-r85r-gjq2-f83r](https://github.com/opf/openproject/security/advisories/GHSA-r85r-gjq2-f83r)
+
+
+
+### CVE-2026-44731 - Improper Access Control on OpenProject through /projects/[projectName]/meetings via "invited_user_id" in GET parameter "filters" leads to user names disclosure
+
+The web application&#39;s meetings filter feature leaks whether a given user ID corresponds to a valid account and discloses the user&#39;s full name, allowing an attacker to enumerate all existing user accounts by probing user IDs and observing differences in the server response.
+
+
+
+This vulnerability was reported by user tuannq\_gg as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-x7j3-cfgf-7mc4](https://github.com/opf/openproject/security/advisories/GHSA-x7j3-cfgf-7mc4)
+
+
+
+### CVE-2026-44732 - IDOR on OpenProject through /api/v3/documents/{id} via PATCH parameter "project_id" leads to Unauthorized Modification of Resources
+
+OpenProject exposes a document update endpoint used to modify existing documents. The target document is loaded with visibility checks and then updated .
+
+
+
+During update, attacker-controlled attributes are applied to the persisted record before authorization is enforced. As a result, a user without `:manage_documents` in the source project can move and modify foreign project documents by setting `project_id` in a single PATCH request.
+
+
+
+This vulnerability was reported by sam91281 as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-mqvv-5mvc-7pg7](https://github.com/opf/openproject/security/advisories/GHSA-mqvv-5mvc-7pg7)
+
+
+
+### CVE-2026-44733 - Business Logic Error on OpenProject through PATCH request to /api/v3/users/me permits to bypass password requirements
+
+A password validation flaw in the change password behavior allows attackers to change a user&#39;s password only with an active session takeover.
+
+
+
+<br>
+
+
+
+This vulnerability was reported by user herdiyanitdev as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-px7f-cj9f-7m4m](https://github.com/opf/openproject/security/advisories/GHSA-px7f-cj9f-7m4m)
+
+
+
+### CVE-2026-44734 - Improper Access Control on OpenProject through the POST request to /projects/[PROJECT_NAME]/cost_reports/[REPORT_ID]/rename
+
+A Missing Authorization vulnerability exists in OpenProject&#39;s CostReportsController. The rename and update actions allow any authenticated user to modify the name, filters, and grouping of any Public cost report in the system without verifying ownership or permission level.
+
+An attacker who discovers or guesses a public report&#39;s numeric ID can rename or overwrite its filter configuration without any warning to the report&#39;s owner.
+
+
+
+This vulnerability was reported by user herdiyanitdev as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-c767-34gh-gh2h](https://github.com/opf/openproject/security/advisories/GHSA-c767-34gh-gh2h)
+
+
+
+### CVE-2026-44735 - Shares API Information Disclosure
+
+The `GET /api/v3/shares` endpoint returns share details for ALL work packages in a project to any user with the `view_shared_work_packages` permission. The authorization check operates at the **project level** only — it does not verify the requesting user can actually view each individual shared work package.
+
+
+
+This vulnerability was reported by GitHub user [DAVIDAROCA27](https://github.com/DAVIDAROCA27).
+
+
+
+For more information, please see the [GitHub advisory #GHSA-cfg3-f34w-9xx5](https://github.com/opf/openproject/security/advisories/GHSA-cfg3-f34w-9xx5)
+
+
+<!-- END CVE AUTOMATED SECTION -->
+
+<!--more-->
+
+## Bug fixes and changes
+
+<!-- Warning: Anything within the below lines will be automatically removed by the release script -->
+<!-- BEGIN AUTOMATED SECTION -->
+
+
+<!-- END AUTOMATED SECTION -->
+<!-- Warning: Anything above this line will be automatically removed by the release script -->
diff --git a/docs/release-notes/17-3-2/README.md b/docs/release-notes/17-3-2/README.md
new file mode 100644
index 00000000000..f0db3f6e761
--- /dev/null
+++ b/docs/release-notes/17-3-2/README.md
@@ -0,0 +1,142 @@
+---
+title: OpenProject 17.3.2
+sidebar_navigation:
+    title: 17.3.2
+release_version: 17.3.2
+release_date: 2026-05-13
+---
+
+ # OpenProject 17.3.2
+
+ Release date: 2026-05-13
+
+ We released [OpenProject 17.3.2](https://community.openproject.org/versions/2296).
+ The release contains several bug fixes and we recommend updating to the newest version.
+ Below you will find a complete list of all changes and bug fixes.
+
+<!-- BEGIN CVE AUTOMATED SECTION -->
+
+## Security fixes
+
+
+
+### CVE-2026-46386 - Docker Container starts with SECRET_KEY_BASE default value
+
+When an attacker knew the secret key base that the application used to derive internal keys from, they could construct encrypted cookies that on the server side were decoded using [Object Marshalling](https://docs.ruby-lang.org/en/4.0/Marshal.html) which allowed the attacker to execute almost arbitrary ruby code within the container, up to a complete remote code execution. This was especially present in Docker containers that shipped with a default value as the secret key base, when it was not manually overwritten, as mentioned in the documentation.
+
+
+
+As a fix, the docker containers now validate that a proper `SECRET_KEY_BASE` environment variable is set Otherwise the application aborts the boot process with an error message. The documentation has been updated to make it even clearer, that the `SECRET_KEY_BASE` env variable must be set. And the decoding of the encrypted cookies has been updated to use JSON encoding instead of Object Marshalling.&nbsp;
+
+
+
+**Administrators that have not set a `SECRET_KEY_BASE` environment before need to set one now. Otherwise the application will not boot.**
+
+
+
+**This will force all users using 2 factor authentication to authenticate on their next login, even if they have saved a cookie to skip 2FA for the next 14 days.**
+
+
+
+This vulnerability was responsibly reported by GitHub user [hkolvenbach](https://github.com/hkolvenbach).
+
+
+
+For more information, please see the [GitHub advisory #GHSA-r85r-gjq2-f83r](https://github.com/opf/openproject/security/advisories/GHSA-r85r-gjq2-f83r)
+
+
+
+### CVE-2026-44731 - Improper Access Control on OpenProject through /projects/[projectName]/meetings via "invited_user_id" in GET parameter "filters" leads to user names disclosure
+
+The web application&#39;s meetings filter feature leaks whether a given user ID corresponds to a valid account and discloses the user&#39;s full name, allowing an attacker to enumerate all existing user accounts by probing user IDs and observing differences in the server response.
+
+
+
+This vulnerability was reported by user tuannq\_gg as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-x7j3-cfgf-7mc4](https://github.com/opf/openproject/security/advisories/GHSA-x7j3-cfgf-7mc4)
+
+
+
+### CVE-2026-44732 - IDOR on OpenProject through /api/v3/documents/{id} via PATCH parameter "project_id" leads to Unauthorized Modification of Resources
+
+OpenProject exposes a document update endpoint used to modify existing documents. The target document is loaded with visibility checks and then updated .
+
+
+
+During update, attacker-controlled attributes are applied to the persisted record before authorization is enforced. As a result, a user without `:manage_documents` in the source project can move and modify foreign project documents by setting `project_id` in a single PATCH request.
+
+
+
+This vulnerability was reported by sam91281 as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-mqvv-5mvc-7pg7](https://github.com/opf/openproject/security/advisories/GHSA-mqvv-5mvc-7pg7)
+
+
+
+### CVE-2026-44733 - Business Logic Error on OpenProject through PATCH request to /api/v3/users/me permits to bypass password requirements
+
+A password validation flaw in the change password behavior allows attackers to change a user&#39;s password only with an active session takeover.
+
+
+
+<br>
+
+
+
+This vulnerability was reported by user herdiyanitdev as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-px7f-cj9f-7m4m](https://github.com/opf/openproject/security/advisories/GHSA-px7f-cj9f-7m4m)
+
+
+
+### CVE-2026-44734 - Improper Access Control on OpenProject through the POST request to /projects/[PROJECT_NAME]/cost_reports/[REPORT_ID]/rename
+
+A Missing Authorization vulnerability exists in OpenProject&#39;s CostReportsController. The rename and update actions allow any authenticated user to modify the name, filters, and grouping of any Public cost report in the system without verifying ownership or permission level.
+
+An attacker who discovers or guesses a public report&#39;s numeric ID can rename or overwrite its filter configuration without any warning to the report&#39;s owner.
+
+
+
+This vulnerability was reported by user herdiyanitdev as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+
+
+For more information, please see the [GitHub advisory #GHSA-c767-34gh-gh2h](https://github.com/opf/openproject/security/advisories/GHSA-c767-34gh-gh2h)
+
+
+
+### CVE-2026-44735 - Shares API Information Disclosure
+
+The `GET /api/v3/shares` endpoint returns share details for ALL work packages in a project to any user with the `view_shared_work_packages` permission. The authorization check operates at the **project level** only — it does not verify the requesting user can actually view each individual shared work package.
+
+
+
+This vulnerability was reported by GitHub user [DAVIDAROCA27](https://github.com/DAVIDAROCA27).
+
+
+
+For more information, please see the [GitHub advisory #GHSA-cfg3-f34w-9xx5](https://github.com/opf/openproject/security/advisories/GHSA-cfg3-f34w-9xx5)
+
+
+<!-- END CVE AUTOMATED SECTION -->
+
+<!--more-->
+
+## Bug fixes and changes
+
+<!-- Warning: Anything within the below lines will be automatically removed by the release script -->
+<!-- BEGIN AUTOMATED SECTION -->
+
+- Bugfix: Performance impact of large Markdown/HTML templates caused by the tagfilter GFM extension \[[#74151](https://community.openproject.org/wp/74151)\]
+- Bugfix: Budget widget breaks when lots of cost types defined \[[#74189](https://community.openproject.org/wp/74189)\]
+- Bugfix: Direct login prevents authentication from mobile app \[[#74569](https://community.openproject.org/wp/74569)\]
+
+<!-- END AUTOMATED SECTION -->
+<!-- Warning: Anything above this line will be automatically removed by the release script -->
diff --git a/docs/release-notes/17-4-0/README.md b/docs/release-notes/17-4-0/README.md
index 6336823417b..9ec9a779c70 100644
--- a/docs/release-notes/17-4-0/README.md
+++ b/docs/release-notes/17-4-0/README.md
@@ -3,7 +3,7 @@ title: OpenProject 17.4.0
 sidebar_navigation:
     title: 17.4.0
 release_version: 17.4.0
-release_date: 2026-04-23
+release_date: 2026-05-13
 ---
 
  # OpenProject 17.4.0
@@ -12,9 +12,8 @@ release_date: 2026-04-23
 
  We released [OpenProject 17.4.0](https://community.openproject.org/versions/2267). The release contains several bug fixes and we recommend updating to the newest version. In these Release Notes, we will give an overview of important feature changes. At the end, you will find a complete list of all changes and bug fixes.
 
-<!-- BEGIN CVE AUTOMATED SECTION -->
-
-<!-- END CVE AUTOMATED SECTION -->
+> [!NOTE]
+> This release includes several security fixes. [Click here to go directly to them](#security-fixes).
 
 ## Important feature changes
 
@@ -26,6 +25,8 @@ Take a look at our release video showing the most important features introduced
 
 With the release of OpenProject 17.4, the Jira Migrator is now available without a feature flag and can be used directly. While the feature is not yet fully complete and still in Beta, it is ready to be tested – preferably first in a non productive environment. We encourage users to try the Jira Migrator and share their feedback. 
 
+![OpenProject Jira Migrator with note that it is a Beta version, listing supported data and what is coming soon or later](openproject-jira-migrator-beta.png)
+
 > [!NOTE]
 > If you would like to share anonymized data from your Jira Migrator usage to support our development team, please [reach out to us](https://www.openproject.org/contact/). We are happy to sign an NDA to ensure confidentiality.
 
@@ -33,7 +34,9 @@ It is now possible to migrate basic custom fields from Jira to OpenProject. This
 
 We will continue to expand support for additional custom field types in future releases to enable even more complete migrations.
 
-Screenshot
+![Work package in OpenProject with imported custom fields from Jira](openproject-17-4-jira-migrator-custom-fields-work-package.png)
+
+See our documentation to learn more about [the OpenProject Jira Migrator](../../installation-and-operations/jira-migration/).
 
 ### Backlog buckets in "Backlog and sprints" view
 
@@ -43,10 +46,14 @@ Work packages can be moved between buckets, sorted within each bucket, and adjus
 
 ![Overlay to create a new backlog bucket in OpenProject, user can enter backlog bucket name](openproject-17-4-backlog-bucket-create.png)
 
+[Learn more about Backlog and sprints with OpenProject](../../user-guide/backlogs-scrum/).
+
 ### Backlog card draggable + one-click for side panel
 
 Backlog cards are now fully draggable, making it easier to move work packages during backlog refinement and sprint planning. At the same time, you can still open a work package in the side panel with a single click to quickly view and edit details without losing context.
 
+![Gif showing Backlog and sprints in OpenProject, dragging a work package from Backlog bucket to Sprints and then opening it per click in the middle of the card](openproject-17-4-backlog-drag-drop.gif)
+
 ### Sprint Start and Complete buttons in the sprint header
 
 You can now start and complete sprints directly from the sprint header by clicking the respective buttons. This makes these actions easier to access and provides a clearer overview of the sprint status.
@@ -62,6 +69,8 @@ You can now copy workflow settings from one role to other roles, using a dedicat
 
 ![Overlay in the OpenProject workflow settings: Copy workflow of "Task" to other roles, user can select multiple roles](openproject-17-4-workflow-copy-to-roles.png)
 
+[See our system admin guide to learn about work package workflows in OpenProject](../../system-admin-guide/manage-work-packages/work-package-workflows/).
+
 ### New widget for upcoming meetings on Project Overview and Home page
 
 A new "My meetings" widget shows your upcoming meetings directly on the Home and Project Overview pages. It displays the most relevant information at a glance, helping you stay on top of your schedule and quickly access upcoming meetings.
@@ -76,15 +85,17 @@ The default modules enabled in demo and trial projects have been updated. Budget
 
 ## Important technical updates
 
-### Expose project-based semantic work package identifier on the API
+### Developers of API V3 clients prepare for 17.5: use the new `displayId` field for rendering work package identifiers instead of `id`
 
-Project-based work package identifiers are now exposed via the API. With upcoming support for semantic identifiers such as `#ABC-123`, a new field `displayId` is available in the API. This field returns the correct identifier format, depending on how the instance is configured.
+As part of our efforts to simplify migrations from Jira to OpenProject, the next release (17.5) will introduce project-based work package identifiers such as `#ABC-123`. Developers of API V3 clients can and should already prepare for this change now. With the current release (17.4), the API V3 exposes a dedicated field, `displayId`, which contains the work package’s current identifier. API clients should use this field whenever rendering links or captions intended for human users.
 
-If you are building or maintaining an application using the OpenProject API V3, we recommend using `displayId` instead of `id` when displaying work package identifiers.
+Starting with 17.5, administrators will be able to switch from the current numeric identifiers, such as `#12345`, to project-based identifiers like `#ABC-123`. The `displayId` field will return the correct identifier format depending on how the instance is configured.
+
+If you are building or maintaining an application that uses the OpenProject API V3, we recommend using `displayId` instead of `id` when displaying work package identifiers.
 
 The `id` field will continue to return the internal database ID and should still be used for API requests such as filtering.
 
-For more information on project-based work package identifiers in OpenProject, see the [Epic currently being developed by our team](https://community.openproject.org/wp/41855)
+For more information about project-based work package identifiers in OpenProject, see the [Epic currently being developed by our team](https://community.openproject.org/wp/41855)
 
 ### Meetings and recurring meetings APIv3 endpoints
 
@@ -94,6 +105,108 @@ New APIv3 endpoints are now available for meetings and recurring meetings. These
 
 You can now configure webhook secrets for GitHub and GitLab integrations. This improves the security of incoming webhook requests.
 
+<!-- BEGIN CVE AUTOMATED SECTION -->
+
+## Security fixes
+
+### CVE-2026-46386 - Docker Container starts with SECRET_KEY_BASE default value
+
+When an attacker knew the secret key base that the application used to derive internal keys from, they could construct encrypted cookies that on the server side were decoded using [Object Marshalling](https://docs.ruby-lang.org/en/4.0/Marshal.html) which allowed the attacker to execute almost arbitrary ruby code within the container, up to a complete remote code execution. This was especially present in Docker containers that shipped with a default value as the secret key base, when it was not manually overwritten, as mentioned in the documentation.
+
+As a fix, the docker containers now validate that a proper `SECRET_KEY_BASE` environment variable is set. Otherwise the application aborts the boot process with an error message. The documentation has been updated to make it even clearer that the `SECRET_KEY_BASE` env variable must be set. And the decoding of the encrypted cookies has been updated to use JSON encoding instead of Object Marshalling.&nbsp;
+
+**Administrators that have not set a** `**SECRET_KEY_BASE**` **environment before need to set one now. Otherwise the application will not boot.**
+
+**This will force all users using 2 factor authentication to authenticate on their next login, even if they have saved a cookie to skip 2FA for the next 14 days.**
+
+
+Guides to setting this for your installation method:
+
+*   Packaged installations: This secret is already being generated automatically. You are not affected
+
+*   Docker-compose: Add `SECRET_KEY_BASE=<your-secret-key-base>` to your .env file. See [docker-compose](https://www.openproject.org/docs/installation-and-operations/installation/docker-compose/) for more information.
+
+*   Docker All-in-One: Add `SECRET_KEY_BASE=<your-secret-key-base>` to your docker run call. See [docker](../../installation-and-operations/installation/docker/) for more information.
+
+*   Helm-charts: [Version 13.5.4](https://github.com/opf/helm-charts/releases/) and higher of the helm chart will automatically create a kubernetes secret using a random string.
+
+    *   If you have not used a `SECRET_KEY_BASE` env previously, we recommend updating to the newest helm version.
+
+    *   If you have an existing strong secret, you are safe already and nothing needs to be done. You _can optionally_ place it as the `existingSecret` as shown [in the Helm chart documentation](https://www.openproject.org/docs/installation-and-operations/installation/helm-chart/#secrets) to use the conventional secret to pass it into the specs.
+
+This vulnerability was responsibly reported by GitHub user [hkolvenbach](https://github.com/hkolvenbach).
+
+For more information, please see the [GitHub advisory #GHSA-r85r-gjq2-f83r](https://github.com/opf/openproject/security/advisories/GHSA-r85r-gjq2-f83r).
+
+
+
+### CVE-2026-44696 - Stored CSS injection via Sanitize::Config::RELAXED[:css] enables phishing overlays and data exfiltration
+
+OpenProject&#39;s rich text (markdown) rendering pipeline uses `Sanitize::Config::RELAXED[:css]` for inline style sanitization. This configuration permits essentially all CSS properties in `style` attributes on permitted HTML elements (`figure`, `img`, `table`, `th`, `tr`, `td`).
+
+This allows any authenticated user with write access to formattable text fields (work package descriptions, comments, project descriptions, news) to inject CSS that:
+
+This vulnerability was reported by GitHub user [NOTTIBOY137](https://github.com/NOTTIBOY137).
+
+For more information, please see the [GitHub advisory #GHSA-j9q2-49mp-hmq5](https://github.com/opf/openproject/security/advisories/GHSA-j9q2-49mp-hmq5).
+
+### CVE-2026-44731 - Improper Access Control on OpenProject through /projects/[projectName]/meetings via "invited_user_id" in GET parameter "filters" leads to user names disclosure
+
+The web application&#39;s meetings filter feature leaks whether a given user ID corresponds to a valid account and discloses the user&#39;s full name, allowing an attacker to enumerate all existing user accounts by probing user IDs and observing differences in the server response.
+
+This vulnerability was reported by user tuannq\_gg as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+For more information, please see the [GitHub advisory #GHSA-x7j3-cfgf-7mc4](https://github.com/opf/openproject/security/advisories/GHSA-x7j3-cfgf-7mc4)
+
+
+### CVE-2026-44732 - IDOR on OpenProject through /api/v3/documents/{id} via PATCH parameter "project_id" leads to Unauthorized Modification of Resources
+
+OpenProject exposes a document update endpoint used to modify existing documents. The target document is loaded with visibility checks and then updated.
+
+During update, attacker-controlled attributes are applied to the persisted record before authorization is enforced. As a result, a user without `:manage_documents` in the source project can move and modify foreign project documents by setting `project_id` in a single PATCH request.
+
+This vulnerability was reported by sam91281 as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+For more information, please see the [GitHub advisory #GHSA-mqvv-5mvc-7pg7](https://github.com/opf/openproject/security/advisories/GHSA-mqvv-5mvc-7pg7)
+
+
+### CVE-2026-44733 - Business Logic Error on OpenProject through PATCH request to /api/v3/users/me permits to bypass password requirements
+
+A password validation flaw in the change password behavior allows attackers to change a user&#39;s password only with an active session takeover.
+
+This vulnerability was reported by user herdiyanitdev as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+For more information, please see the [GitHub advisory #GHSA-px7f-cj9f-7m4m](https://github.com/opf/openproject/security/advisories/GHSA-px7f-cj9f-7m4m)
+
+
+### CVE-2026-44734 - Improper Access Control on OpenProject through the POST request to /projects/[PROJECT_NAME]/cost_reports/[REPORT_ID]/rename
+
+A Missing Authorization vulnerability exists in OpenProject&#39;s CostReportsController. The rename and update actions allow any authenticated user to modify the name, filters, and grouping of any Public cost report in the system without verifying ownership or permission level.
+
+An attacker who discovers or guesses a public report&#39;s numeric ID can rename or overwrite its filter configuration without any warning to the report&#39;s owner.
+
+This vulnerability was reported by user herdiyanitdev as part of the [YesWeHack.com OpenProject Bug Bounty program](https://yeswehack.com/programs/openproject), sponsored by the European Commission.
+
+For more information, please see the [GitHub advisory #GHSA-c767-34gh-gh2h](https://github.com/opf/openproject/security/advisories/GHSA-c767-34gh-gh2h).
+
+### CVE-2026-44735 - Shares API Information Disclosure
+
+The `GET /api/v3/shares` endpoint returns share details for ALL work packages in a project to any user with the `view_shared_work_packages` permission. The authorization check operates at the **project level** only — it does not verify the requesting user can actually view each individual shared work package.
+
+This vulnerability was reported by GitHub user [DAVIDAROCA27](https://github.com/DAVIDAROCA27).
+
+For more information, please see the [GitHub advisory #GHSA-cfg3-f34w-9xx5](https://github.com/opf/openproject/security/advisories/GHSA-cfg3-f34w-9xx5).
+
+### CVE-2026-44736 - Relations API Filter Bypasses Visibility Scope, Leaking Cross-Project Work Package Subjects
+
+The `GET /api/v3/relations` endpoint allows any authenticated user to retrieve relations — and the **subject (title)** of work packages they have no permission to view — by supplying an arbitrary work package ID in the `involved`, `fromId`, or `toId` filter. This bypasses the `Relation.visible` scope due to a flawed performance optimization in `RelationQuery`.
+
+This vulnerability was reported by GitHub user [mlgzackfly](https://github.com/mlgzackfly).
+
+For more information, please see the [GitHub advisory #GHSA-p9gq-hrgh-2645](https://github.com/opf/openproject/security/advisories/GHSA-p9gq-hrgh-2645).
+
+<!-- END CVE AUTOMATED SECTION -->
+
 <!--more-->
 
 ## Bug fixes and changes
@@ -109,7 +222,6 @@ You can now configure webhook secrets for GitHub and GitLab integrations. This i
 - Feature: Better UX for setting project identifiers during project copy \[[#72856](https://community.openproject.org/wp/72856)\]
 - Feature: Backlog buckets in &quot;Backlog and sprints&quot; view \[[#73081](https://community.openproject.org/wp/73081)\]
 - Feature: Sprint column, sort and group for work packages table \[[#73104](https://community.openproject.org/wp/73104)\]
-- Feature: Support basic custom fields migration \[[#73147](https://community.openproject.org/wp/73147)\]
 - Feature: Replace danger zones in authentication module with danger dialogs \[[#73355](https://community.openproject.org/wp/73355)\]
 - Feature: Allow webhook secrets for GitHub and Gitlab integrations \[[#73387](https://community.openproject.org/wp/73387)\]
 - Feature: Have a sprint start/complete button in the sprint header \[[#73402](https://community.openproject.org/wp/73402)\]
@@ -120,67 +232,76 @@ You can now configure webhook secrets for GitHub and GitLab integrations. This i
 - Feature: Limited move options for work packages in sprint \[[#73563](https://community.openproject.org/wp/73563)\]
 - Feature: Add widget for upcoming meetings on project overview and home page and remove users widget \[[#73684](https://community.openproject.org/wp/73684)\]
 - Feature: Expose project-based semantic work package identifier on the API \[[#73735](https://community.openproject.org/wp/73735)\]
-- Feature: Add canonical URL meta tags to Project and WP pages for crawler optimization \[[#73926](https://community.openproject.org/wp/73926)\]
 - Feature: Multi-substring search in project/workspace selector \[[#74199](https://community.openproject.org/wp/74199)\]
-- Bugfix: Toast not visible on mobile when page is scrolled down \[[#45673](https://community.openproject.org/wp/45673)\]
 - Bugfix: Default configuration for Work packages assigned to me on My Page is wrong \[[#57633](https://community.openproject.org/wp/57633)\]
+- Bugfix: Form in copy workflow functionality does not render/work properly \[[#58776](https://community.openproject.org/wp/58776)\]
 - Bugfix: List is scrollable even if there is only 1 item \[[#59732](https://community.openproject.org/wp/59732)\]
 - Bugfix: Project selector does not read selected items in screenreader \[[#61405](https://community.openproject.org/wp/61405)\]
+- Bugfix: Extra space in notification &quot;X days ago by Y user&quot; \[[#63647](https://community.openproject.org/wp/63647)\]
+- Bugfix: Wiki menu visible when using the browser&#39;s print function/print dialog \[[#67643](https://community.openproject.org/wp/67643)\]
 - Bugfix: Blank page and error 404 when calendar, board, team planner, role is deleted \[[#68573](https://community.openproject.org/wp/68573)\]
 - Bugfix: User is redirected to Attribute help text admin after editing a help text from Project overview page \[[#69142](https://community.openproject.org/wp/69142)\]
-- Bugfix: Clicking work package tabs triggers page reload and flickering \[[#69210](https://community.openproject.org/wp/69210)\]
-- Bugfix: Infinite SAML Seeding Loop Causing Disk Space Exhaustion \[[#69339](https://community.openproject.org/wp/69339)\]
-- Bugfix: Days label is cut off \[[#69504](https://community.openproject.org/wp/69504)\]
 - Bugfix: Work package search input of other user visible \[[#69706](https://community.openproject.org/wp/69706)\]
-- Bugfix: Deleted Nextcloud storage stays selected in the PIR template \[[#69767](https://community.openproject.org/wp/69767)\]
-- Bugfix: Fix accessibility errors found by ERB Lint \[[#70166](https://community.openproject.org/wp/70166)\]
 - Bugfix: Deep linking to a meeting outcome does not highlight it \[[#70319](https://community.openproject.org/wp/70319)\]
 - Bugfix: Helm-Chart: Allow user to provide service specific annotations \[[#71055](https://community.openproject.org/wp/71055)\]
 - Bugfix: External link capture not working in documents \[[#71111](https://community.openproject.org/wp/71111)\]
 - Bugfix: Backup: include attachments checkbox cannot be checked \[[#71237](https://community.openproject.org/wp/71237)\]
-- Bugfix: Connection error on successive navigation to and from a document \[[#71901](https://community.openproject.org/wp/71901)\]
-- Bugfix: Impossible to search for archived projects, page reverts to active projects list on its own \[[#71971](https://community.openproject.org/wp/71971)\]
+- Bugfix: NoMethodError in Calendar::ICalController#show \[[#71354](https://community.openproject.org/wp/71354)\]
 - Bugfix: User cannot create a WP with auto generated subject \[[#72207](https://community.openproject.org/wp/72207)\]
 - Bugfix: Backlogs: Not able to navigate through the more menu with arrows \[[#72460](https://community.openproject.org/wp/72460)\]
-- Bugfix: Click position is lost when activating an inline edit field \[[#72837](https://community.openproject.org/wp/72837)\]
-- Bugfix: Incorrect confirmation message when deleting a OAuth token \[[#72958](https://community.openproject.org/wp/72958)\]
-- Bugfix: Page loads twice after sprint creation \[[#73316](https://community.openproject.org/wp/73316)\]
+- Bugfix: Missing feedback (sucess message) on deleting versions \[[#72719](https://community.openproject.org/wp/72719)\]
+- Bugfix: Error 500 when trying to delete a work package with unit costs on a relative URL root \[[#72857](https://community.openproject.org/wp/72857)\]
 - Bugfix: SCIM User API returns duplicate records \[[#73431](https://community.openproject.org/wp/73431)\]
-- Bugfix: POST/PATCH/DELETE requests to APIv3 return unauthorized \[[#73499](https://community.openproject.org/wp/73499)\]
 - Bugfix: FieldsetGroups are missing descriptions \[[#73501](https://community.openproject.org/wp/73501)\]
-- Bugfix: Copy &amp; Paste Loses Formatting in Documents \[[#73669](https://community.openproject.org/wp/73669)\]
-- Bugfix: Not possible to follow link custom field from work package list view \[[#73673](https://community.openproject.org/wp/73673)\]
 - Bugfix: Make sharing options more understandable  \[[#73706](https://community.openproject.org/wp/73706)\]
 - Bugfix: Doubled scrollbar on a Board \[[#73714](https://community.openproject.org/wp/73714)\]
 - Bugfix: Pressing &quot;Load more&quot; in the backlog, then drag n dropping a work package will restore the original backlog list \[[#73731](https://community.openproject.org/wp/73731)\]
-- Bugfix: &quot;Start sprint&quot; button remains active after browser back button \[[#73749](https://community.openproject.org/wp/73749)\]
 - Bugfix: Work packages can be assigned to closed sprints \[[#73750](https://community.openproject.org/wp/73750)\]
 - Bugfix: Sprints column scroll bar overlaps content \[[#73831](https://community.openproject.org/wp/73831)\]
 - Bugfix: Projects filter does not work with project list export \[[#73841](https://community.openproject.org/wp/73841)\]
 - Bugfix: 401 error does not help user during jira import. \[[#73844](https://community.openproject.org/wp/73844)\]
+- Bugfix: Plain text Password received on account creation \[[#73849](https://community.openproject.org/wp/73849)\]
 - Bugfix: Skip closed meetings when using &quot;Move to next&quot;/&quot;Duplicate in next&quot; for an agenda item \[[#73900](https://community.openproject.org/wp/73900)\]
 - Bugfix: Onboarding tour breaks at Team planner if EE is missing \[[#73910](https://community.openproject.org/wp/73910)\]
 - Bugfix: External links cause two blank tabs/windows \[[#73914](https://community.openproject.org/wp/73914)\]
 - Bugfix: Browser title is truncated after 70 characters \[[#73986](https://community.openproject.org/wp/73986)\]
 - Bugfix: Wrong timezone for timestamp of work package pdf export \[[#74117](https://community.openproject.org/wp/74117)\]
 - Bugfix: Trial instance seeded recurring meeting template is in draft mode \[[#74150](https://community.openproject.org/wp/74150)\]
-- Bugfix: Automatically converting project identifiers should not lead to usage of reserved keywords \[[#74161](https://community.openproject.org/wp/74161)\]
 - Bugfix: Sprint Filter in work packages only loads 100 Sprints \[[#74166](https://community.openproject.org/wp/74166)\]
-- Bugfix: Moving work packages after switching to semantic and back should not lead to errors \[[#74192](https://community.openproject.org/wp/74192)\]
 - Bugfix: Backlog card drag preview has incorrect padding \[[#74195](https://community.openproject.org/wp/74195)\]
+- Bugfix: 500 Error on Save when &#39;Group&#39; selected as User under &quot;Planned Labor Costs&quot; in Budget \[[#74197](https://community.openproject.org/wp/74197)\]
 - Bugfix: Having &quot;Manage sprint items&quot; without &quot;Edit work packages&quot; fails to move work packages in backlogs \[[#74201](https://community.openproject.org/wp/74201)\]
 - Bugfix: Users can execute custom actions despite conditions not applying \[[#74294](https://community.openproject.org/wp/74294)\]
-- Bugfix: Cancel occurence action item is called &#39;Delete&#39; on My Meetings page \[[#74303](https://community.openproject.org/wp/74303)\]
-- Bugfix: User cannot restore a cancelled occurrence if series has a deleted WP on the agenda \[[#74304](https://community.openproject.org/wp/74304)\]
-- Feature: UX improvements for workflow configuration - quick wins \[[#71530](https://community.openproject.org/wp/71530)\]
-- Feature: Provide project templates within new OpenProject instances \[[#72778](https://community.openproject.org/wp/72778)\]
+- Bugfix: &quot;Load X more items&quot; link is missing from the backlog \[[#74317](https://community.openproject.org/wp/74317)\]
+- Bugfix: Details tab navigation arrow / symbol disappears after first selection \[[#74320](https://community.openproject.org/wp/74320)\]
+- Bugfix: Replace user number with relevant information during project(s) migration \[[#74323](https://community.openproject.org/wp/74323)\]
+- Bugfix: Issues in work package sharing notification email \[[#74342](https://community.openproject.org/wp/74342)\]
+- Bugfix: Make it obvious that Jira Migrator is in Beta status. \[[#74343](https://community.openproject.org/wp/74343)\]
+- Bugfix: Move down link shown incorrectly for 1 backlog bucket item \[[#74351](https://community.openproject.org/wp/74351)\]
+- Bugfix: Backlogs all state is not preserved when creating a new sprint or a backlog bucket \[[#74352](https://community.openproject.org/wp/74352)\]
+- Bugfix: Slack integration not properly listed in Integrations sublevel \[[#74355](https://community.openproject.org/wp/74355)\]
+- Bugfix: All backlog state is not passed to backlog buckets \[[#74356](https://community.openproject.org/wp/74356)\]
+- Bugfix: No specific validations present for closed meetings \[[#74372](https://community.openproject.org/wp/74372)\]
+- Bugfix: No max limit for password length \[[#74399](https://community.openproject.org/wp/74399)\]
+- Bugfix: Sprint filter in ticket detail only loads 25 sprints \[[#74516](https://community.openproject.org/wp/74516)\]
+- Bugfix: Errors with &quot;include project&quot; work package list filter with a portfolio \[[#74536](https://community.openproject.org/wp/74536)\]
+- Bugfix: Migration: 20250929070310 AddViewAllPrincipalsPermissionToExistingRoles failing on upgrade \[[#74539](https://community.openproject.org/wp/74539)\]
+- Bugfix: The all parameter is lost when using the finish sprint dialog \[[#74636](https://community.openproject.org/wp/74636)\]
+- Bugfix: &quot;Subproject of&quot; macro not working anymore \[[#74676](https://community.openproject.org/wp/74676)\]
+- Bugfix: Copying a work package with instance wide sharing leads to two projects sharing instance wide \[[#74721](https://community.openproject.org/wp/74721)\]
+- Bugfix: Meeting current\_schedule\_end is wrong \[[#74729](https://community.openproject.org/wp/74729)\]
+- Bugfix: Configured redirect after log in (authentication) does not work \[[#74756](https://community.openproject.org/wp/74756)\]
+- Feature: Jira Migrator imports custom fields \[[#73147](https://community.openproject.org/wp/73147)\]
 
 <!-- END AUTOMATED SECTION -->
 <!-- Warning: Anything above this line will be automatically removed by the release script -->
 
 ## Contributions
+
 A very special thank you goes to Helmholtz-Zentrum Berlin, City of Cologne, Deutsche Bahn and ZenDiS for sponsoring released or upcoming features. Your support, alongside the efforts of our amazing Community, helps drive these innovations. Also a big thanks to our Community members for reporting bugs and helping us identify and provide fixes. Special thanks for reporting and finding bugs go to Andreas H., Madhu Reddy, and Anna Mund.
 
+We also want to thank Community contributor [K. Uihlein](https://github.com/kuihlein) for contributing to our documentation of the OpenProject GitLab Integration. This is much appreciated.
+
 Last but not least, we are very grateful for our very engaged translation contributors on Crowdin, who translated quite a few OpenProject strings! This release we would like to particularly thank the following users:
 
 - [Samo](https://crowdin.com/profile/samoe), for a great number of translations into Turkish.
diff --git a/docs/release-notes/17-4-0/openproject-17-4-backlog-drag-drop.gif b/docs/release-notes/17-4-0/openproject-17-4-backlog-drag-drop.gif
new file mode 100644
index 00000000000..affa8f9b601
Binary files /dev/null and b/docs/release-notes/17-4-0/openproject-17-4-backlog-drag-drop.gif differ
diff --git a/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png b/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png
new file mode 100644
index 00000000000..fd20267cd2a
Binary files /dev/null and b/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png differ
diff --git a/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png b/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png
new file mode 100644
index 00000000000..7498854ec44
Binary files /dev/null and b/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png differ
diff --git a/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png b/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png
new file mode 100644
index 00000000000..c4f268966cb
Binary files /dev/null and b/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png differ
diff --git a/docs/release-notes/17-5-0/README.md b/docs/release-notes/17-5-0/README.md
new file mode 100644
index 00000000000..d9baa5d7494
--- /dev/null
+++ b/docs/release-notes/17-5-0/README.md
@@ -0,0 +1,48 @@
+---
+title: OpenProject 17.5.0
+sidebar_navigation:
+    title: 17.5.0
+release_version: 17.5.0
+release_date: 2026-06-10
+---
+
+ # OpenProject 17.5.0
+
+ Release date: 2026-06-10
+
+ TODO
+
+<!-- BEGIN CVE AUTOMATED SECTION -->
+
+<!-- END CVE AUTOMATED SECTION -->
+
+## Important feature changes
+
+TODO
+
+## Important technical updates
+
+### Session authentication relies on new header for non-GET requests
+
+Previously when making session-authenticated requests to APIv3 endpoints, non-GET requests were only allowed when the
+HTTP Header `X-Requested-With: XMLHttpRequest` was present. This header is usually associated with frameworks such as jQuery,
+but is also added for all requests originating from the OpenProject frontend still. For session authentication it served the
+purpose of preventing cross-site request forgery, e.g. through simple HTTP forms.
+
+The usage of this header has now been replaced with a check for `Sec-Fetch-Site: same-origin`, which is added by a browser automatically
+to requests and also can't be added or altered through JavaScript. It's unlikely that this causes any disruptions, because session authentication
+should only be used for browser-contexts, where the new header will still be present. Non-browser API-access should use different authentication
+methods (e.g. OAuth or API tokens), which are not affected by this change.
+
+## Bug fixes and changes
+
+<!-- Warning: Anything within the below lines will be automatically removed by the release script -->
+<!-- BEGIN AUTOMATED SECTION -->
+
+<!-- END AUTOMATED SECTION -->
+<!-- Warning: Anything above this line will be automatically removed by the release script -->
+
+## Contributions
+
+TODO
+
diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md
index 3ec076a4427..4ea9dd89bdb 100644
--- a/docs/release-notes/README.md
+++ b/docs/release-notes/README.md
@@ -13,6 +13,27 @@ Stay up to date and get an overview of the new features included in the releases
 <!--- New release notes are generated below. Do not remove comment. -->
 <!--- RELEASE MARKER -->
 
+## 17.4.0
+
+Release date: 2026-05-13
+
+[Release Notes](17-4-0/)
+
+
+## 17.3.2
+
+Release date: 2026-05-13
+
+[Release Notes](17-3-2/)
+
+
+## 17.2.4
+
+Release date: 2026-05-13
+
+[Release Notes](17-2-4/)
+
+
 ## 17.3.1
 
 Release date: 2026-04-20
diff --git a/docs/user-guide/backlogs-scrum/README.md b/docs/user-guide/backlogs-scrum/README.md
index 8ec545a3834..e308d646b14 100644
--- a/docs/user-guide/backlogs-scrum/README.md
+++ b/docs/user-guide/backlogs-scrum/README.md
@@ -3,46 +3,85 @@ sidebar_navigation:
   title: Backlogs (Scrum)
   priority: 850
 description: Support your Scrum methodology with Backlogs
-keywords: backlogs, scrum, backlog, agile, sprint, sprint bucket
+keywords: backlogs, scrum, backlog, agile, sprint, sprint bucket, backlog bucket
 ---
 
 # Backlog and sprints
 
 > [!NOTE]
-> The **Backlogs** module is getting a reset with OpenProject 17.3 release and will undergo further changes in the upcoming versions. We will keep updating the documentation over time to reflect these changes.
+> The **Backlogs module** is actively being improved. This documentation is updated regularly to reflect the latest changes.
 
-Working in agile project teams is becoming increasingly important, and with OpenProject, it is easier than ever.
-
-OpenProject supports your work with the Agile and Scrum methodology by providing a variety of improved functionalities. You can now create and manage sprints, record and prioritize work packages in sprints and the backlog, use automated sprint boards or burndown-charts, and much more. For more information, please refer to the OpenProject [agile and scrum features](https://www.openproject.org/collaboration-software-features/agile-project-management/) page.
+Working in agile project teams is becoming increasingly important, and with OpenProject, it is easier than ever. OpenProject supports your work with the Agile and Scrum methodology by providing a variety of improved functionalities. You can now create and manage sprints, record and prioritize work packages in sprints and the backlog, use automated sprint boards or burndown-charts, and much more. For more information, please refer to the OpenProject [agile and scrum features](https://www.openproject.org/collaboration-software-features/agile-project-management/) page.
 
 <div class="glossary">
-
-
 A **Backlog** is defined as a module that allows you to use the backlogs feature in OpenProject. In order to use backlogs in a project, the Backlogs module has to be activated in the project settings.
-
 </div>
 
 Please note that this user guide does not represent an introduction to Scrum methodology, but merely explains the Scrum-related functionalities and user instructions in OpenProject.
 
-![Backlogs module in OpenProject showing backlog items and multiple sprints with work packages](openproject_user_guide_backlogs_sprints.png)
-
 ## Manage the backlog
 
-The Backlog is automatically populated based on the work packages in a project that are not yet in sprints. When you add a work package to a sprint, or close it, the work package will no longer be visible in the backlog. 
+The Backlogs module is divided into two sides: on the left, you'll find the **Backlog**, consisting of the **Inbox backlog** at the bottom and any **Backlog buckets** above it (if created). On the right, **Sprints** are displayed. If no backlog buckets have been created, only the Inbox backlog is shown on the left.
 
-When there are too many items in the Backlog, a **Show more items** link appears in the middle. This compacts the middle section so that you always see the top and the bottom of the backlog. 
+![Backlogs module in OpenProject showing backlog items and multiple sprints with work packages](openproject_user_guide_backlog_bucket.png)
 
-![Backlog view with many items collapsed behind a “Show more items” link in the middle](openproject_user_guide_backlogs_show_more_items.png)
+### Backlog buckets
 
-Next to every work package listed in the backlog or sprint, you can access the **More (three dots)** menu, including the following options:
+Backlog buckets help you organize and prioritize work packages within the backlog. A backlog bucket is a named list of work packages that can be refined independently from the Inbox backlog. The Backlog and sprints view displays all backlog buckets within the current project, including the bucket name and the number of contained work packages.
 
-- Open **details view** or **fullscreen view** of a work package. These options allow you to choose how much information (about the backlog item) you'd like to be displayed. 
+> [!NOTE]
+> Backlog buckets are project-specific and are not shared across projects.
+
+Backlog buckets are ordered alphabetically by name, while the **Inbox backlog** is always displayed at the bottom.
+
+A work package:
+
+- can only belong to one backlog bucket at a time.
+- cannot belong to a sprint and a backlog bucket at the same time.
+- cannot belong to a backlog bucket and the Inbox backlog at the same time.
+
+You can sort work packages within a backlog bucket via drag and drop or by using the **Move** option from the work package menu.
+
+#### Create a backlog bucket
+
+To create a backlog bucket, click the **+ Backlog bucket** button in the Backlog and sprints view. This will open a dialog where you can enter the bucket name. Click **Create** to proceed.
+
+> [!NOTE]
+> Creating and deleting backlog buckets requires the appropriate project permissions.
+
+![Backlogs module in OpenProject showing backlog items and multiple sprints with work packages](openproject_user_guide_backlog_add_bucket.png)
+
+#### Rename or delete a backlog bucket
+
+Open the **More (three dots)** menu of a backlog bucket to:
+
+- Rename the backlog bucket
+- Delete the backlog bucket
+
+When deleting a backlog bucket, all contained work packages are automatically moved to the bottom of the Inbox backlog.
+
+### Inbox backlog
+
+The Inbox backlog is automatically populated with all work packages in a project that are not yet assigned to a sprint or backlog bucket. When a work package is added to a sprint or bucket, or closed, it is removed from the Inbox.
+
+> [!NOTE]
+> Closed work packages are removed from the Inbox backlog and backlog buckets, but continue to be visible in sprints.
+
+When there are too many items in the backlog, a **Show more items** link appears in the middle of the Inbox backlog. This collapses the middle section so that you always see the top and the bottom of the Inbox backlog.
+
+![Backlog view with many items collapsed behind a "Show more items" link in the middle](openproject_user_guide_backlogs_show_more_items.png)
+
+## Sort and move work packages
+
+Next to every work package listed in the Inbox backlog, backlog bucket, or sprint, you can access the **More (three dots)** menu, including the following options:
+
+- Open **details view** or **fullscreen view** of a work package. These options allow you to choose how much information (about the backlog item) you'd like to be displayed.
 - **Copy** the work package URL or ID to the clipboard.
 - **Move** a work package.
 
 ![Backlog work package menu with options like details view, copy link, and move](openproject_user_guide_backlogs_menu_items.png)
 
-Details view opens the work package information on the right side, the same way as in the notifications center.
+Details view opens the work package information on the right side, the same way as in the notifications center. You can open the details view with a single click on a work package card.
 
 ![Backlog item opened in details view on the right side panel](openproject_user_guide_backlogs_open_details_view.png)
 
@@ -50,16 +89,23 @@ Opening the fullscreen view opens the work package in fullscreen.
 
 ![Work package opened in fullscreen in OpenProject](openproject_user_guide_backlogs_fullscreen_view.png)
 
-With the **Move** option, you can order items according to your preference within the backlog or move them to a sprint. You can also drag and drop the work packages. 
+You can prioritize work packages within the Inbox backlog, a backlog bucket, or a sprint by dragging and dropping them or by using the **Move** option from the work package menu. The entire work package card can be used as a drag-and-drop area.
+
+Depending on the current location of the work package, you can move it:
+
+- within the current backlog bucket or sprint,
+- into another backlog bucket,
+- into another sprint,
+- back to the Inbox backlog.
 
 ![Move options menu for a backlog item showing reorder and sprint assignment options](openproject_user_guide_backlog_move_options.png)
 
 ## Create and manage sprints
 
->  [!IMPORTANT] 
->  Starting with the OpenProject 17.3 release, Sprints are new objects no longer linked to versions (as was the case with previous OpenProject versions). 
+> [!IMPORTANT]
+> Starting with the OpenProject 17.3 release, Sprints are new objects no longer linked to versions (as was the case with previous OpenProject versions).
 
-A **Sprint** is a planned and time-boxed period in which a Scrum team completes a defined set of tasks. They are containers or buckets where work packages can be manually added or removed from the Backlog via a drag-and-drop icon.
+A **Sprint** is a planned and time-boxed period in which a Scrum team completes a defined set of tasks. They are containers where work packages can be manually added or removed from the Inbox backlog or backlog buckets via drag and drop or the menu.
 
 ### Create a sprint
 
@@ -71,28 +117,39 @@ The naming of sprints is number-based by default (e.g. Sprint 1, Sprint 2). Thes
 
 ### Start or complete a sprint
 
-Your sprint is set in motion by clicking the **Start sprint** button. Clicking it will open the sprint board.
+Your sprint is set in motion by clicking the **Start** button in the sprint header. Clicking it will open the sprint board.
 
 > [!NOTE]
-> A sprint cannot be started if another sprint is already in progress. In this case the button will be disabled.
+> A sprint cannot be started if another sprint is already in progress. In this case, the button will be disabled.
 
 ![Start sprint button in the Backlogs module interface](openproject_user_guide_backlogs_start_sprint.png)
 
-Once a sprint has started, it is considered active and can be managed through the **Sprint menu** options, which include:
+Once a sprint has started, it is considered active. The sprint header displays the current sprint status and allows you to complete the sprint directly from the header. To complete a sprint, click the **Complete** button in the sprint header.
+
+![Complete sprint button in the Backlogs module interface](openproject_user_guide_backlogs_complete_sprint.png)
+
+If there are still unfinished work packages in the sprint, a dialog will open prompting you to decide what should happen to them. You can choose to:
+
+- Move them to the top of the Inbox backlog
+- Move them to the bottom of the Inbox backlog
+- Move them to another sprint
+
+If you choose to move work packages to another sprint, you will need to select the target sprint from the list. After making your selection, click the **Complete sprint** button to finish the sprint. The sprint will then be marked as completed, and other sprints can be started.
+
+![Form to select how to proceed with items in progress when completing a sprint in OpenProject](openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png)
+
+Additional sprint actions are available through the **Sprint menu**, including:
 
-- Complete sprint
 - Edit sprint
 - Add work package
-- Open a Sprint board
+- Sprint board
 - Burndown chart
 
-![Sprint menu with options like edit sprint, add work package, board, and burndown chart](openproject_user_guide_backlog_sprint_menu_item.png)
+![Sprint menu with options like edit sprint and add work package](openproject_user_guide_backlog_sprint_menu_item.png)
 
 ### Add a work package
 
-In order to create a new work package in the Backlogs module, click on the More (three dots) icon in the top right corner of a Sprint and choose **+ Add work package** from the drop-down menu.
-
-A form dialog will appear to create a new work package. Here, you directly specify the work package type, subject, and description. Click **Create** to proceed.
+In order to create a new work package in the Backlogs module, click on the More (three dots) icon in the top right corner of a Sprint and choose **+ Add work package** from the drop-down menu. A form dialog will appear to create a new work package. Here, you directly specify the work package type, subject, and description. Click **Create** to proceed.
 
 ![A new work package added to a sprint directly in OpenProject Backlogs module](openproject_user_guide_backlogs_new_wp_form.png)
 
@@ -100,15 +157,16 @@ A new item will be added to the backlog to display the newly created story.
 
 ### Prioritize stories
 
-You can prioritize different work packages within a backlog or sprint by either using the **Move** option or by dragging & dropping them. This allows you to assign work packages to a specific sprint, return to a backlog or re-order them within a sprint.
+You can prioritize different work packages within the Inbox backlog, a backlog bucket, or a sprint by either using the **Move** option or by dragging & dropping them. This allows you to assign work packages to a specific sprint or backlog bucket, return them to the Inbox backlog, or re-order them within a sprint or bucket.
 
 ### Story points
 
-In a sprint, you can directly document necessary effort as story points. The overall effort for a sprint is automatically calculated, and the sum of story points is displayed in the top row.
+In a sprint, you can directly document necessary effort as story points.
 
 <div class="glossary">
 Story points are defined as numbers assigned to a work package used to estimate (relatively) the size of the work.
 </div>
+
 ![Story points assigned to work packages in a sprint in OpenProject backlogs module](openproject_user_guide_backlogs_story_points.png)
 
 You can edit story points directly from the backlogs view. In order to do so, simply click the work package you want to edit and make the desired changes in the detailed view of the work package that will open on the right.
@@ -117,9 +175,9 @@ You can edit story points directly from the backlogs view. In order to do so, si
 
 ### Sprint boards
 
-Sprint boards are especially helpful for teams to track and visualize progress from the start. When you click the **Start sprint** within the Backlog, a dedicated sprint board is automatically created and you are forwarded to the active sprint board. 
+Sprint boards are especially helpful for teams to track and visualize progress from the start. Sprint boards replace the previous task boards used in earlier versions of the Backlogs module.
 
-Boards are named using this pattern: [Project name: Sprint name]. As an example: **Scrum project: Sprint 1**.
+When you click the **Start** button in a sprint header, a dedicated sprint board is automatically created and you are forwarded to the active sprint board. Boards are named using this pattern: [Project name: Sprint name]. As an example: **Scrum project: Sprint 1**.
 
 The sprint board inherits project permissions automatically, which means it is accessible to all project members by default.
 
@@ -128,17 +186,26 @@ The sprint board inherits project permissions automatically, which means it is a
 > [!NOTE]
 > The sprint board and burndown chart are only visible on the menu when a sprint is active.
 
+### Sprint field in work package tables
+
+The Sprint property can also be used in work package tables. You can:
+
+- display the Sprint column,
+- sort by Sprint,
+- group work packages by Sprint.
+
+> [!NOTE]
+> Viewing Sprint information in work package tables requires the appropriate project permissions.
+
 ### Burndown charts
 
-**Burndown charts** are a helpful tool to visualize a sprint’s progress. With OpenProject, you can generate sprint and task burndown charts automatically.
+**Burndown charts** are a helpful tool to visualize a sprint's progress. With OpenProject, you can generate sprint and task burndown charts automatically.
 
 > [!TIP]
-> As a precondition, the sprint’s start and end date must be defined and the information on story points should be well maintained.
+> As a precondition, the sprint's start and end date must be defined and the information on story points should be well maintained.
 
-The sprint burndown is calculated from the sum of estimated story points. If a user story is set to “closed“ (or another status which is defined as closed (see admin settings)), it counts towards the burndown.
-
-The task burndown is calculated from the estimated number of hours necessary to complete a task. If a task is set to “closed“, the burndown is adjusted.
+The sprint burndown is calculated from the sum of estimated story points. If a user story is set to "closed" (or another status which is defined as closed (see admin settings)), it counts towards the burndown. The task burndown is calculated from the estimated number of hours necessary to complete a task. If a task is set to "closed", the burndown is adjusted.
 
 The remaining story points per sprint are displayed in the chart. Optionally, the ideal burn-down can be displayed for reference. The ideal burndown assumes a linear completion of story points from the beginning to the end of a sprint.
 
-![An example of a burndown chart in OpenProject](openproject_user_guide_backlogs_burndown_chart_example.png)
\ No newline at end of file
+![An example of a burndown chart in OpenProject](openproject_user_guide_backlogs_burndown_chart_example.png)
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png
new file mode 100644
index 00000000000..5b490b4b164
Binary files /dev/null and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png
new file mode 100644
index 00000000000..96a7523d937
Binary files /dev/null and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png
index 54635fe3de9..8830774ebff 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png
new file mode 100644
index 00000000000..e52952a1f98
Binary files /dev/null and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png
new file mode 100644
index 00000000000..844ca2c074c
Binary files /dev/null and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png
new file mode 100644
index 00000000000..6dc764d9300
Binary files /dev/null and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png
index cb832841c2e..5d4d17bed75 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png
index 4148a9cb7f5..d99e807b22b 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png differ
diff --git a/docs/user-guide/projects/project-home/README.md b/docs/user-guide/projects/project-home/README.md
index 225e8d15817..1e5e63ff7f0 100644
--- a/docs/user-guide/projects/project-home/README.md
+++ b/docs/user-guide/projects/project-home/README.md
@@ -25,7 +25,7 @@ The project home page is a centralized overview page that displays all essential
 
 You can access the project overview by navigating to **Project home** in the project menu on the left.
 
-![Project overview page for a specific project in OpenProject](openproject_user_guide_project_home_page.png)
+![Project overview page for a specific project in OpenProject](openproject_user_guide_project_new_home_page.png)
 
 On the project overview page you will see the following sections: 
 
@@ -40,7 +40,7 @@ Here you can also [mark a project as favorite](#mark-a-project-as-favorite) or [
 
 
 
-![Pre-set project widgets on the overview tab of the project home page](openproject_user_guide_project_home_overview_tab.png)
+![Pre-set project widgets on the overview tab of the project home page](openproject_user_guide_project_home_new_overview_tab.png)
 
 The **Overview** tab is a pre-configured to provide a concise summary of the project’s status. Its layout is fixed and cannot be modified. It includes the following widgets: 
 
@@ -49,11 +49,13 @@ The **Overview** tab is a pre-configured to provide a concise summary of the pro
   - [Status](./project-widgets/#status-widget) 
 
   - [Subitems](./project-widgets/#subitems-widget) 
+  - [Meetings](project-widgets/#meetings-widget)
+    > [!TIP]
+    > If you do not see the meeting widgets displayed, make sure the Meetings module is activated for the project. 
 
   - [Members](./project-widgets/#members-widget) 
 
   - [News](project-widgets/#news-widget) 
-
   - [Budgets](project-widgets/#budgets-widgets)
 
     > [!TIP]
diff --git a/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png b/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png
new file mode 100644
index 00000000000..a3df4b74d9a
Binary files /dev/null and b/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png differ
diff --git a/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png b/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png
new file mode 100644
index 00000000000..b48ee00636f
Binary files /dev/null and b/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png differ
diff --git a/docs/user-guide/projects/project-home/project-widgets/README.md b/docs/user-guide/projects/project-home/project-widgets/README.md
index 8e3f8fb6a28..1ef88538473 100644
--- a/docs/user-guide/projects/project-home/project-widgets/README.md
+++ b/docs/user-guide/projects/project-home/project-widgets/README.md
@@ -236,6 +236,18 @@ Actual costs include labor costs from logged time and unit costs from cost entri
 
 Click the  **View actual cost details** link at the bottom of the widget to open the cost reports filtered for the current project.
 
+## Meetings widget
+This widget provides an overview of your relevant and upcoming meetings.
+> [!NOTE] 
+> The Meetings widget is only displayed on the **Overview tab** of a project home page.
+
+For the meetings widget to be displayed on your project home page, the Meetings module has to be activated first. Once activated, all meetings you are participating in are displayed.
+
+![Meetings widget displayed under Over tab on Project home page in OpenProject](openproject_user_guide_project_overview_all_meetings_widget.png)
+
+If there are no meetings in your project yet and the Meetings module is activated, the widget allows you to create a new meeting directly by clicking the **+ Meeting** button.
+
+![Meetings widget displayed under Over tab on Project home page in OpenProject, with no meetings created yet](openproject_user_guide_project_create_meeting_widget.png)
 
 ## Resize and reorder widgets
 
diff --git a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png
new file mode 100644
index 00000000000..088b494e581
Binary files /dev/null and b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png differ
diff --git a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png
new file mode 100644
index 00000000000..58fb048868e
Binary files /dev/null and b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png differ
diff --git a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png
new file mode 100644
index 00000000000..8654dfc2585
Binary files /dev/null and b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png differ
diff --git a/docs/user-guide/wiki/wiki-faq/README.md b/docs/user-guide/wiki/wiki-faq/README.md
index d039da24c7f..defb0585df6 100644
--- a/docs/user-guide/wiki/wiki-faq/README.md
+++ b/docs/user-guide/wiki/wiki-faq/README.md
@@ -34,7 +34,7 @@ You have probably unchecked the option “show as menu item in project navigatio
 
 ## What is the markup language of the wiki in OpenProject?
 
-The wiki syntax used in OpenProject is Textile.
+The wiki syntax that is used internally in OpenProject is GitHub-flavored Markdown (GFM) + HTML for specific widgets. Prior to OpenProject 8.0, the platform used Textile. However, any legacy Textile content is automatically migrated to the GFM Markdown format during system upgrades.
 
 ## I am not used to Textile - is there any documentation where I can get help?
 
diff --git a/frontend/angular.json b/frontend/angular.json
index 041ea30c195..0a5f664086c 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -151,7 +151,9 @@
             "tsConfig": "tsconfig.spec.json",
             "buildTarget": "OpenProject:build",
             "providersFile": "src/test-providers.ts",
-            "setupFiles": ["src/test-setup.ts"]
+            "setupFiles": ["src/test-setup.ts"],
+            "browsers": ["chromium", "firefox", "webkit"],
+            "reporters": ["dot"]
           }
         },
         "lint": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f5b21a17811..1cf4c73c8a5 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -139,6 +139,8 @@
         "@html-eslint/eslint-plugin": "^0.59.0",
         "@html-eslint/parser": "^0.59.0",
         "@stylistic/eslint-plugin": "^5.7.1",
+        "@testing-library/dom": "^10.4.1",
+        "@testing-library/react": "^16.3.2",
         "@types/codemirror": "5.60.5",
         "@types/dom-navigation": "^1.0.7",
         "@types/dragula": "^3.7.5",
@@ -159,7 +161,8 @@
         "@types/webpack-env": "^1.16.0",
         "@typescript-eslint/eslint-plugin": "8.53.0",
         "@typescript-eslint/parser": "8.53.1",
-        "@vitest/coverage-v8": "^4.1.5",
+        "@vitest/browser-playwright": "^4.1.6",
+        "@vitest/coverage-v8": "^4.1.6",
         "@vitest/eslint-plugin": "^1.6.16",
         "angular-eslint": "^21.1.0",
         "browserslist": "^4.28.1",
@@ -170,11 +173,12 @@
         "eslint-plugin-react-hooks": "^7.0.1",
         "globals": "^17.5.0",
         "jsdom": "^29.1.1",
+        "playwright": "^1.59.1",
         "source-map-explorer": "^2.5.2",
         "ts-node": "~10.9.2",
         "typescript": "^5.9.3",
         "typescript-eslint": "^8.56.1",
-        "vitest": "^4.1.5",
+        "vitest": "^4.1.6",
         "wscat": "^6.1.0"
       },
       "optionalDependencies": {
@@ -4028,6 +4032,13 @@
         "node": ">=18"
       }
     },
+    "node_modules/@blazediff/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@blazediff/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@blocknote/core": {
       "version": "0.44.2",
       "resolved": "https://registry.npmjs.org/@blocknote/core/-/core-0.44.2.tgz",
@@ -8190,6 +8201,13 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@primer/behaviors": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-1.3.5.tgz",
@@ -9240,6 +9258,64 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
+    "node_modules/@testing-library/dom": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
+      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.3.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.5.0",
+        "picocolors": "1.1.1",
+        "pretty-format": "^27.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@testing-library/dom/node_modules/aria-query": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
+    "node_modules/@testing-library/react": {
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@testing-library/dom": "^10.0.0",
+        "@types/react": "^18.0.0 || ^19.0.0",
+        "@types/react-dom": "^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@tiptap/core": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.12.0.tgz",
@@ -9583,6 +9659,13 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@types/aria-query": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
+      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/body-parser": {
       "version": "1.19.6",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
@@ -10956,15 +11039,72 @@
         "vite": "^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/@vitest/browser": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/browser/-/browser-4.1.6.tgz",
+      "integrity": "sha512-ynsspTubXGSpa58JFJ24xIQt4z4A25epSbugEyaTmmrV1//Wec9EgE/LtoaC6yxUrXi5P7erGHRrkdZIHaVQuA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@blazediff/core": "1.9.1",
+        "@vitest/mocker": "4.1.6",
+        "@vitest/utils": "4.1.6",
+        "magic-string": "^0.30.21",
+        "pngjs": "^7.0.0",
+        "sirv": "^3.0.2",
+        "tinyrainbow": "^3.1.0",
+        "ws": "^8.19.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "vitest": "4.1.6"
+      }
+    },
+    "node_modules/@vitest/browser-playwright": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/browser-playwright/-/browser-playwright-4.1.6.tgz",
+      "integrity": "sha512-4csoeyl/qwHyxU2zNL0++WaoDr8YJDXOQPwWPNJoTZ+QzcdO3INYKgF5Zfz730Io7zbkuv914aZmfQ+QE+1Hvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/browser": "4.1.6",
+        "@vitest/mocker": "4.1.6",
+        "tinyrainbow": "^3.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "playwright": "*",
+        "vitest": "4.1.6"
+      },
+      "peerDependenciesMeta": {
+        "playwright": {
+          "optional": false
+        }
+      }
+    },
+    "node_modules/@vitest/browser/node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
     "node_modules/@vitest/coverage-v8": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.5.tgz",
-      "integrity": "sha512-38C0/Ddb7HcRG0Z4/DUem8x57d2p9jYgp18mkaYswEOQBGsI1CG4f/hjm0ZCeaJfWhSZ4k7jgs29V1Zom7Ki9A==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.6.tgz",
+      "integrity": "sha512-36l628fQ/9a/8ihy97eOtEnvWQEdqULQOJtcaxtoNq0G1w3Mxd4szSahOaMM9/NGyZ+hyKcMtIW/WIxq0XQViQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^1.0.2",
-        "@vitest/utils": "4.1.5",
+        "@vitest/utils": "4.1.6",
         "ast-v8-to-istanbul": "^1.0.0",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
@@ -10978,8 +11118,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "4.1.5",
-        "vitest": "4.1.5"
+        "@vitest/browser": "4.1.6",
+        "vitest": "4.1.6"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -11230,16 +11370,16 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.5.tgz",
-      "integrity": "sha512-PWBaRY5JoKuRnHlUHfpV/KohFylaDZTupcXN1H9vYryNLOnitSw60Mw9IAE2r67NbwwzBw/Cc/8q9BK3kIX8Kw==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.6.tgz",
+      "integrity": "sha512-7EHDquPthALSV0jhhjgEW8FXaviMx7rSqu8W6oqCoAuOhKov814P99QDV1pxMA3QPv21YudvJngIhjrNI4opLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.1.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.1.5",
-        "@vitest/utils": "4.1.5",
+        "@vitest/spy": "4.1.6",
+        "@vitest/utils": "4.1.6",
         "chai": "^6.2.2",
         "tinyrainbow": "^3.1.0"
       },
@@ -11248,13 +11388,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.5.tgz",
-      "integrity": "sha512-/x2EmFC4mT4NNzqvC3fmesuV97w5FC903KPmey4gsnJiMQ3Be1IlDKVaDaG8iqaLFHqJ2FVEkxZk5VmeLjIItw==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.6.tgz",
+      "integrity": "sha512-MCFc63czMjEInOlcY2cpQCvCN+KgbAn+60xu9cMgP4sKaLC5JNAKw7JH8QdAnoAC88hW1IiSNZ+GgVXlN1UcMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.1.5",
+        "@vitest/spy": "4.1.6",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -11285,9 +11425,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.5.tgz",
-      "integrity": "sha512-7I3q6l5qr03dVfMX2wCo9FxwSJbPdwKjy2uu/YPpU3wfHvIL4QHwVRp57OfGrDFeUJ8/8QdfBKIV12FTtLn00g==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.6.tgz",
+      "integrity": "sha512-h5SxD/IzNhZYnrSZRsUZQIC+vD0GY8cUvq0iwsmkFKixRCKLLWqCXa/FIQ4S1R+sI+PGoojkHsdNrbZiM9Qpgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11298,13 +11438,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.5.tgz",
-      "integrity": "sha512-2D+o7Pr82IEO46YPpoA/YU0neeyr6FTerQb5Ro7BUnBuv6NQtT/kmVnczngiMEBhzgqz2UZYl5gArejsyERDSQ==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.6.tgz",
+      "integrity": "sha512-nOPCmn2+yD0ZNmKdsXGv/UxMMWbMuKeD6GyYncNwdkYDxpQvrPSKYj2rWuDjC2Y4b6w6hjip5dBKFzEUuZe3vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.1.5",
+        "@vitest/utils": "4.1.6",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -11312,14 +11452,14 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.5.tgz",
-      "integrity": "sha512-zypXEt4KH/XgKGPUz4eC2AvErYx0My5hfL8oDb1HzGFpEk1P62bxSohdyOmvz+d9UJwanI68MKwr2EquOaOgMQ==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.6.tgz",
+      "integrity": "sha512-YhsdE6xAVfTDmzjxL2ZDUvjj+ZsgyOKe+TdQzqkD72wIOmHka8NuGQ6NpTNZv9D2Z63fbwWKJPeVpEw4EQgYxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.5",
-        "@vitest/utils": "4.1.5",
+        "@vitest/pretty-format": "4.1.6",
+        "@vitest/utils": "4.1.6",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -11338,9 +11478,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.5.tgz",
-      "integrity": "sha512-2lNOsh6+R2Idnf1TCZqSwYlKN2E/iDlD8sgU59kYVl+OMDmvldO1VDk39smRfpUNwYpNRVn3w4YfuC7KfbBnkQ==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.6.tgz",
+      "integrity": "sha512-JFKxMx6udhwKh/Ldo270e17QX710vgunMkuPAvXjHSvC6oqLWAHhVhjg/I71q0u0CBSErIODV1Kjv0FQNSWjdg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -11348,13 +11488,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.5.tgz",
-      "integrity": "sha512-76wdkrmfXfqGjueGgnb45ITPyUi1ycZ4IHgC2bhPDUfWHklY/q3MdLOAB+TF1e6xfl8NxNY0ZYaPCFNWSsw3Ug==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.6.tgz",
+      "integrity": "sha512-FxIY+U81R3LGKCxaHHFRQ5+g6/iRgGLmeHWdp2Amj4ljQRrEIWHmZyDfDYBRZlpyqA7qKxtS9DD1dhk8RnRIVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.5",
+        "@vitest/pretty-format": "4.1.6",
         "convert-source-map": "^2.0.0",
         "tinyrainbow": "^3.1.0"
       },
@@ -14053,6 +14193,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/dom-accessibility-api": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/dom-autoscroller": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/dom-autoscroller/-/dom-autoscroller-2.3.4.tgz",
@@ -18481,6 +18628,16 @@
         "node": ">=12"
       }
     },
+    "node_modules/lz-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "lz-string": "bin/bin.js"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.30.17",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
@@ -21019,6 +21176,63 @@
         "node": ">=16.0.0"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.60.0.tgz",
+      "integrity": "sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.60.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.60.0.tgz",
+      "integrity": "sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/pngjs": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-7.0.0.tgz",
+      "integrity": "sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.19.0"
+      }
+    },
     "node_modules/portfinder": {
       "version": "1.0.32",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
@@ -21258,6 +21472,34 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/prismjs": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
@@ -21744,6 +21986,13 @@
         "react": "*"
       }
     },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/react-number-format": {
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.4.4.tgz",
@@ -23044,6 +23293,21 @@
       "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==",
       "license": "MIT"
     },
+    "node_modules/sirv": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
+      "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/slice-ansi": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
@@ -24049,6 +24313,16 @@
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
       "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
     },
+    "node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tough-cookie": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz",
@@ -25235,19 +25509,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.5.tgz",
-      "integrity": "sha512-9Xx1v3/ih3m9hN+SbfkUyy0JAs72ap3r7joc87XL6jwF0jGg6mFBvQ1SrwaX+h8BlkX6Hz9shdd1uo6AF+ZGpg==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.6.tgz",
+      "integrity": "sha512-6lvjbS3p9b4CrdCmguzbh2/4uoXhGE2q71R4OX5sqF9R1bo9Xd6fGrMAfvp5wnCzlBnFVdCOp6onuTQVbo8iUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.1.5",
-        "@vitest/mocker": "4.1.5",
-        "@vitest/pretty-format": "4.1.5",
-        "@vitest/runner": "4.1.5",
-        "@vitest/snapshot": "4.1.5",
-        "@vitest/spy": "4.1.5",
-        "@vitest/utils": "4.1.5",
+        "@vitest/expect": "4.1.6",
+        "@vitest/mocker": "4.1.6",
+        "@vitest/pretty-format": "4.1.6",
+        "@vitest/runner": "4.1.6",
+        "@vitest/snapshot": "4.1.6",
+        "@vitest/spy": "4.1.6",
+        "@vitest/utils": "4.1.6",
         "es-module-lexer": "^2.0.0",
         "expect-type": "^1.3.0",
         "magic-string": "^0.30.21",
@@ -25275,12 +25549,12 @@
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.1.5",
-        "@vitest/browser-preview": "4.1.5",
-        "@vitest/browser-webdriverio": "4.1.5",
-        "@vitest/coverage-istanbul": "4.1.5",
-        "@vitest/coverage-v8": "4.1.5",
-        "@vitest/ui": "4.1.5",
+        "@vitest/browser-playwright": "4.1.6",
+        "@vitest/browser-preview": "4.1.6",
+        "@vitest/browser-webdriverio": "4.1.6",
+        "@vitest/coverage-istanbul": "4.1.6",
+        "@vitest/coverage-v8": "4.1.6",
+        "@vitest/ui": "4.1.6",
         "happy-dom": "*",
         "jsdom": "*",
         "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -25702,27 +25976,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
-      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/webpack-merge": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
@@ -26030,9 +26283,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.20.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
+      "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -28724,6 +28977,12 @@
       "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
       "dev": true
     },
+    "@blazediff/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@blazediff/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==",
+      "dev": true
+    },
     "@blocknote/core": {
       "version": "0.44.2",
       "resolved": "https://registry.npmjs.org/@blocknote/core/-/core-0.44.2.tgz",
@@ -31209,6 +31468,12 @@
         "tsyringe": "^4.10.0"
       }
     },
+    "@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true
+    },
     "@primer/behaviors": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-1.3.5.tgz",
@@ -31828,6 +32093,42 @@
       "resolved": "https://registry.npmjs.org/@tanstack/store/-/store-0.7.7.tgz",
       "integrity": "sha512-xa6pTan1bcaqYDS9BDpSiS63qa6EoDkPN9RsRaxHuDdVDNntzq3xNwR5YKTU/V3SkSyC9T4YVOPh2zRQN0nhIQ=="
     },
+    "@testing-library/dom": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
+      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.3.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.5.0",
+        "picocolors": "1.1.1",
+        "pretty-format": "^27.0.2"
+      },
+      "dependencies": {
+        "aria-query": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+          "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+          "dev": true,
+          "requires": {
+            "dequal": "^2.0.3"
+          }
+        }
+      }
+    },
+    "@testing-library/react": {
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5"
+      }
+    },
     "@tiptap/core": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.12.0.tgz",
@@ -32014,6 +32315,12 @@
         "tslib": "^2.4.0"
       }
     },
+    "@types/aria-query": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
+      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
+      "dev": true
+    },
     "@types/body-parser": {
       "version": "1.19.6",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
@@ -32984,14 +33291,52 @@
       "integrity": "sha512-HXciTXN/sDBYWgeAD4V4s0DN0g72x5mlxQhHxtYu3Tt8BLa6MzcJZUyDVFCdtjNs3bfENVHVzOsmooTVuNgAAw==",
       "dev": true
     },
+    "@vitest/browser": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/browser/-/browser-4.1.6.tgz",
+      "integrity": "sha512-ynsspTubXGSpa58JFJ24xIQt4z4A25epSbugEyaTmmrV1//Wec9EgE/LtoaC6yxUrXi5P7erGHRrkdZIHaVQuA==",
+      "dev": true,
+      "requires": {
+        "@blazediff/core": "1.9.1",
+        "@vitest/mocker": "4.1.6",
+        "@vitest/utils": "4.1.6",
+        "magic-string": "^0.30.21",
+        "pngjs": "^7.0.0",
+        "sirv": "^3.0.2",
+        "tinyrainbow": "^3.1.0",
+        "ws": "^8.19.0"
+      },
+      "dependencies": {
+        "magic-string": {
+          "version": "0.30.21",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+          "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/sourcemap-codec": "^1.5.5"
+          }
+        }
+      }
+    },
+    "@vitest/browser-playwright": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/browser-playwright/-/browser-playwright-4.1.6.tgz",
+      "integrity": "sha512-4csoeyl/qwHyxU2zNL0++WaoDr8YJDXOQPwWPNJoTZ+QzcdO3INYKgF5Zfz730Io7zbkuv914aZmfQ+QE+1Hvw==",
+      "dev": true,
+      "requires": {
+        "@vitest/browser": "4.1.6",
+        "@vitest/mocker": "4.1.6",
+        "tinyrainbow": "^3.1.0"
+      }
+    },
     "@vitest/coverage-v8": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.5.tgz",
-      "integrity": "sha512-38C0/Ddb7HcRG0Z4/DUem8x57d2p9jYgp18mkaYswEOQBGsI1CG4f/hjm0ZCeaJfWhSZ4k7jgs29V1Zom7Ki9A==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.6.tgz",
+      "integrity": "sha512-36l628fQ/9a/8ihy97eOtEnvWQEdqULQOJtcaxtoNq0G1w3Mxd4szSahOaMM9/NGyZ+hyKcMtIW/WIxq0XQViQ==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^1.0.2",
-        "@vitest/utils": "4.1.5",
+        "@vitest/utils": "4.1.6",
         "ast-v8-to-istanbul": "^1.0.0",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
@@ -33126,26 +33471,26 @@
       }
     },
     "@vitest/expect": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.5.tgz",
-      "integrity": "sha512-PWBaRY5JoKuRnHlUHfpV/KohFylaDZTupcXN1H9vYryNLOnitSw60Mw9IAE2r67NbwwzBw/Cc/8q9BK3kIX8Kw==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.6.tgz",
+      "integrity": "sha512-7EHDquPthALSV0jhhjgEW8FXaviMx7rSqu8W6oqCoAuOhKov814P99QDV1pxMA3QPv21YudvJngIhjrNI4opLg==",
       "dev": true,
       "requires": {
         "@standard-schema/spec": "^1.1.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.1.5",
-        "@vitest/utils": "4.1.5",
+        "@vitest/spy": "4.1.6",
+        "@vitest/utils": "4.1.6",
         "chai": "^6.2.2",
         "tinyrainbow": "^3.1.0"
       }
     },
     "@vitest/mocker": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.5.tgz",
-      "integrity": "sha512-/x2EmFC4mT4NNzqvC3fmesuV97w5FC903KPmey4gsnJiMQ3Be1IlDKVaDaG8iqaLFHqJ2FVEkxZk5VmeLjIItw==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.6.tgz",
+      "integrity": "sha512-MCFc63czMjEInOlcY2cpQCvCN+KgbAn+60xu9cMgP4sKaLC5JNAKw7JH8QdAnoAC88hW1IiSNZ+GgVXlN1UcMQ==",
       "dev": true,
       "requires": {
-        "@vitest/spy": "4.1.5",
+        "@vitest/spy": "4.1.6",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -33162,32 +33507,32 @@
       }
     },
     "@vitest/pretty-format": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.5.tgz",
-      "integrity": "sha512-7I3q6l5qr03dVfMX2wCo9FxwSJbPdwKjy2uu/YPpU3wfHvIL4QHwVRp57OfGrDFeUJ8/8QdfBKIV12FTtLn00g==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.6.tgz",
+      "integrity": "sha512-h5SxD/IzNhZYnrSZRsUZQIC+vD0GY8cUvq0iwsmkFKixRCKLLWqCXa/FIQ4S1R+sI+PGoojkHsdNrbZiM9Qpgw==",
       "dev": true,
       "requires": {
         "tinyrainbow": "^3.1.0"
       }
     },
     "@vitest/runner": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.5.tgz",
-      "integrity": "sha512-2D+o7Pr82IEO46YPpoA/YU0neeyr6FTerQb5Ro7BUnBuv6NQtT/kmVnczngiMEBhzgqz2UZYl5gArejsyERDSQ==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.6.tgz",
+      "integrity": "sha512-nOPCmn2+yD0ZNmKdsXGv/UxMMWbMuKeD6GyYncNwdkYDxpQvrPSKYj2rWuDjC2Y4b6w6hjip5dBKFzEUuZe3vA==",
       "dev": true,
       "requires": {
-        "@vitest/utils": "4.1.5",
+        "@vitest/utils": "4.1.6",
         "pathe": "^2.0.3"
       }
     },
     "@vitest/snapshot": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.5.tgz",
-      "integrity": "sha512-zypXEt4KH/XgKGPUz4eC2AvErYx0My5hfL8oDb1HzGFpEk1P62bxSohdyOmvz+d9UJwanI68MKwr2EquOaOgMQ==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.6.tgz",
+      "integrity": "sha512-YhsdE6xAVfTDmzjxL2ZDUvjj+ZsgyOKe+TdQzqkD72wIOmHka8NuGQ6NpTNZv9D2Z63fbwWKJPeVpEw4EQgYxw==",
       "dev": true,
       "requires": {
-        "@vitest/pretty-format": "4.1.5",
-        "@vitest/utils": "4.1.5",
+        "@vitest/pretty-format": "4.1.6",
+        "@vitest/utils": "4.1.6",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -33204,18 +33549,18 @@
       }
     },
     "@vitest/spy": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.5.tgz",
-      "integrity": "sha512-2lNOsh6+R2Idnf1TCZqSwYlKN2E/iDlD8sgU59kYVl+OMDmvldO1VDk39smRfpUNwYpNRVn3w4YfuC7KfbBnkQ==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.6.tgz",
+      "integrity": "sha512-JFKxMx6udhwKh/Ldo270e17QX710vgunMkuPAvXjHSvC6oqLWAHhVhjg/I71q0u0CBSErIODV1Kjv0FQNSWjdg==",
       "dev": true
     },
     "@vitest/utils": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.5.tgz",
-      "integrity": "sha512-76wdkrmfXfqGjueGgnb45ITPyUi1ycZ4IHgC2bhPDUfWHklY/q3MdLOAB+TF1e6xfl8NxNY0ZYaPCFNWSsw3Ug==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.6.tgz",
+      "integrity": "sha512-FxIY+U81R3LGKCxaHHFRQ5+g6/iRgGLmeHWdp2Amj4ljQRrEIWHmZyDfDYBRZlpyqA7qKxtS9DD1dhk8RnRIVQ==",
       "dev": true,
       "requires": {
-        "@vitest/pretty-format": "4.1.5",
+        "@vitest/pretty-format": "4.1.6",
         "convert-source-map": "^2.0.0",
         "tinyrainbow": "^3.1.0"
       },
@@ -35089,6 +35434,12 @@
         "@leichtgewicht/ip-codec": "^2.0.1"
       }
     },
+    "dom-accessibility-api": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
+      "dev": true
+    },
     "dom-autoscroller": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/dom-autoscroller/-/dom-autoscroller-2.3.4.tgz",
@@ -38214,6 +38565,12 @@
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
       "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew=="
     },
+    "lz-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
+      "dev": true
+    },
     "magic-string": {
       "version": "0.30.17",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
@@ -39937,6 +40294,37 @@
         "tslib": "^2.8.1"
       }
     },
+    "playwright": {
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.60.0.tgz",
+      "integrity": "sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==",
+      "dev": true,
+      "requires": {
+        "fsevents": "2.3.2",
+        "playwright-core": "1.60.0"
+      },
+      "dependencies": {
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "playwright-core": {
+      "version": "1.60.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.60.0.tgz",
+      "integrity": "sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==",
+      "dev": true
+    },
+    "pngjs": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-7.0.0.tgz",
+      "integrity": "sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==",
+      "dev": true
+    },
     "portfinder": {
       "version": "1.0.32",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
@@ -40072,6 +40460,25 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        }
+      }
+    },
     "prismjs": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
@@ -40414,6 +40821,12 @@
       "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
       "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw=="
     },
+    "react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
+    },
     "react-number-format": {
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.4.4.tgz",
@@ -41305,6 +41718,17 @@
         }
       }
     },
+    "sirv": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
+      "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==",
+      "dev": true,
+      "requires": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      }
+    },
     "slice-ansi": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
@@ -42018,6 +42442,12 @@
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
       "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
     },
+    "totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true
+    },
     "tough-cookie": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz",
@@ -42716,18 +43146,18 @@
       }
     },
     "vitest": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.5.tgz",
-      "integrity": "sha512-9Xx1v3/ih3m9hN+SbfkUyy0JAs72ap3r7joc87XL6jwF0jGg6mFBvQ1SrwaX+h8BlkX6Hz9shdd1uo6AF+ZGpg==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.6.tgz",
+      "integrity": "sha512-6lvjbS3p9b4CrdCmguzbh2/4uoXhGE2q71R4OX5sqF9R1bo9Xd6fGrMAfvp5wnCzlBnFVdCOp6onuTQVbo8iUQ==",
       "dev": true,
       "requires": {
-        "@vitest/expect": "4.1.5",
-        "@vitest/mocker": "4.1.5",
-        "@vitest/pretty-format": "4.1.5",
-        "@vitest/runner": "4.1.5",
-        "@vitest/snapshot": "4.1.5",
-        "@vitest/spy": "4.1.5",
-        "@vitest/utils": "4.1.5",
+        "@vitest/expect": "4.1.6",
+        "@vitest/mocker": "4.1.6",
+        "@vitest/pretty-format": "4.1.6",
+        "@vitest/runner": "4.1.6",
+        "@vitest/snapshot": "4.1.6",
+        "@vitest/spy": "4.1.6",
+        "@vitest/utils": "4.1.6",
         "es-module-lexer": "^2.0.0",
         "expect-type": "^1.3.0",
         "magic-string": "^0.30.21",
@@ -43046,12 +43476,6 @@
             "ajv-formats": "^2.1.1",
             "ajv-keywords": "^5.1.0"
           }
-        },
-        "ws": {
-          "version": "8.20.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
-          "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
-          "dev": true
         }
       }
     },
@@ -43223,9 +43647,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ=="
+      "version": "8.20.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
+      "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w=="
     },
     "wscat": {
       "version": "6.1.0",
diff --git a/frontend/package.json b/frontend/package.json
index a6f73b71065..fb87931e3c7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,6 +17,8 @@
     "@html-eslint/eslint-plugin": "^0.59.0",
     "@html-eslint/parser": "^0.59.0",
     "@stylistic/eslint-plugin": "^5.7.1",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/codemirror": "5.60.5",
     "@types/dom-navigation": "^1.0.7",
     "@types/dragula": "^3.7.5",
@@ -37,7 +39,8 @@
     "@types/webpack-env": "^1.16.0",
     "@typescript-eslint/eslint-plugin": "8.53.0",
     "@typescript-eslint/parser": "8.53.1",
-    "@vitest/coverage-v8": "^4.1.5",
+    "@vitest/browser-playwright": "^4.1.6",
+    "@vitest/coverage-v8": "^4.1.6",
     "@vitest/eslint-plugin": "^1.6.16",
     "angular-eslint": "^21.1.0",
     "browserslist": "^4.28.1",
@@ -48,11 +51,12 @@
     "eslint-plugin-react-hooks": "^7.0.1",
     "globals": "^17.5.0",
     "jsdom": "^29.1.1",
+    "playwright": "^1.59.1",
     "source-map-explorer": "^2.5.2",
     "ts-node": "~10.9.2",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.56.1",
-    "vitest": "^4.1.5",
+    "vitest": "^4.1.6",
     "wscat": "^6.1.0"
   },
   "dependencies": {
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 1bca3a907a7..b3de94b03e8 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -181,7 +181,6 @@ import {
   OpNonWorkingDaysListComponent,
 } from 'core-app/shared/components/op-non-working-days-list/op-non-working-days-list.component';
 import { PersistentToggleComponent } from 'core-app/shared/components/persistent-toggle/persistent-toggle.component';
-import { TypeFormConfigurationComponent } from 'core-app/features/admin/types/type-form-configuration.component';
 import { ToastsContainerComponent } from 'core-app/shared/components/toaster/toasts-container.component';
 import { GlobalSearchWorkPackagesComponent } from 'core-app/core/global_search/global-search-work-packages.component';
 import {
@@ -423,7 +422,6 @@ export class OpenProjectModule implements DoBootstrap {
     registerCustomElement('opce-non-working-days-list', OpNonWorkingDaysListComponent, { injector });
     registerCustomElement('opce-main-menu-resizer', MainMenuResizerComponent, { injector });
     registerCustomElement('opce-persistent-toggle', PersistentToggleComponent, { injector });
-    registerCustomElement('opce-admin-type-form-configuration', TypeFormConfigurationComponent, { injector });
     registerCustomElement('opce-toasts-container', ToastsContainerComponent, { injector });
     registerCustomElement('opce-global-search-work-packages', GlobalSearchWorkPackagesComponent, { injector });
     registerCustomElement('opce-custom-date-action-admin', CustomDateActionAdminComponent, { injector });
diff --git a/frontend/src/app/core/active-window/active-window.service.ts b/frontend/src/app/core/active-window/active-window.service.ts
index b5c17117c13..d16d35c3e66 100644
--- a/frontend/src/app/core/active-window/active-window.service.ts
+++ b/frontend/src/app/core/active-window/active-window.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable, DOCUMENT } from '@angular/core';
+import { Injectable, DOCUMENT, inject } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { debugLog } from 'core-app/shared/helpers/debug_output';
 
@@ -6,7 +6,9 @@ import { debugLog } from 'core-app/shared/helpers/debug_output';
 export class ActiveWindowService {
   private activeState$ = new BehaviorSubject<boolean>(true);
 
-  constructor(@Inject(DOCUMENT) document:Document) {
+  constructor() {
+    const document = inject<Document>(DOCUMENT);
+
     document.addEventListener('visibilitychange', () => {
       if (document.visibilityState) {
         debugLog(`Browser window has visibility state changed to ${document.visibilityState}`);
diff --git a/frontend/src/app/core/apiv3/api-v3.service.ts b/frontend/src/app/core/apiv3/api-v3.service.ts
index cf6aa288ead..dc39e5742c3 100644
--- a/frontend/src/app/core/apiv3/api-v3.service.ts
+++ b/frontend/src/app/core/apiv3/api-v3.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { ApiV3GettableResource, ApiV3ResourceCollection } from 'core-app/core/apiv3/paths/apiv3-resource';
 import { Constructor } from 'core-app/core/util-types';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -65,6 +65,9 @@ import {
 
 @Injectable({ providedIn: 'root' })
 export class ApiV3Service {
+  readonly injector = inject(Injector);
+  readonly pathHelper = inject(PathHelperService);
+
   // /api/v3/attachments
   public readonly attachments = this.apiV3CollectionEndpoint('attachments');
 
@@ -173,11 +176,6 @@ export class ApiV3Service {
   // VIRTUAL boards are /api/v3/grids + a scope filter
   public readonly boards = this.apiV3CustomEndpoint(ApiV3BoardsPaths);
 
-  constructor(
-    readonly injector:Injector,
-    readonly pathHelper:PathHelperService,
-  ) { }
-
   /**
    * Returns the part of the API that exists both
    *  - WITHIN a project scope /api/v3/projects/*
diff --git a/frontend/src/app/core/apiv3/endpoints/projects/project.cache.ts b/frontend/src/app/core/apiv3/endpoints/projects/project.cache.ts
index bf76e19acd4..30f5f97fd2e 100644
--- a/frontend/src/app/core/apiv3/endpoints/projects/project.cache.ts
+++ b/frontend/src/app/core/apiv3/endpoints/projects/project.cache.ts
@@ -37,8 +37,8 @@ import { ProjectResource } from 'core-app/features/hal/resources/project-resourc
 export class ProjectCache extends StateCacheService<ProjectResource> {
   @InjectField() private schemaCacheService:SchemaCacheService;
 
-  constructor(readonly injector:Injector,
-    state:MultiInputState<ProjectResource>) {
+  // eslint-disable-next-line @angular-eslint/prefer-inject -- manually instantiated, not DI-resolved
+  constructor(readonly injector:Injector, state:MultiInputState<ProjectResource>) {
     super(state);
   }
 
diff --git a/frontend/src/app/core/augmenting/openproject-augmenting.module.ts b/frontend/src/app/core/augmenting/openproject-augmenting.module.ts
index 31e4c868487..5f9c0c242a8 100644
--- a/frontend/src/app/core/augmenting/openproject-augmenting.module.ts
+++ b/frontend/src/app/core/augmenting/openproject-augmenting.module.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { NgModule } from '@angular/core';
+import { NgModule, inject } from '@angular/core';
 import { OpenprojectModalModule } from 'core-app/shared/components/modal/modal.module';
 import { OpModalWrapperAugmentService } from 'core-app/shared/components/modal/modal-wrapper-augment.service';
 
@@ -34,7 +34,9 @@ import { OpModalWrapperAugmentService } from 'core-app/shared/components/modal/m
   imports: [OpenprojectModalModule],
 })
 export class OpenprojectAugmentingModule {
-  constructor(modalWrapper:OpModalWrapperAugmentService) {
+  constructor() {
+    const modalWrapper = inject(OpModalWrapperAugmentService);
+
     // Setup augmenting services
     modalWrapper.setupListener();
 
diff --git a/frontend/src/app/core/backup/op-backup.service.ts b/frontend/src/app/core/backup/op-backup.service.ts
index e3183398230..2e5d636cdf7 100644
--- a/frontend/src/app/core/backup/op-backup.service.ts
+++ b/frontend/src/app/core/backup/op-backup.service.ts
@@ -26,17 +26,15 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { Observable } from 'rxjs';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 
 @Injectable({ providedIn: 'root' })
 export class OpenProjectBackupService {
-  constructor(
-    protected apiV3Service:ApiV3Service,
-  ) {
-  }
+  protected apiV3Service = inject(ApiV3Service);
+
 
   public triggerBackup(backupToken:string, includeAttachments = true):Observable<HalResource> {
     return this
diff --git a/frontend/src/app/core/browser/browser-detector.service.ts b/frontend/src/app/core/browser/browser-detector.service.ts
index 711cff51561..9076045dbbc 100644
--- a/frontend/src/app/core/browser/browser-detector.service.ts
+++ b/frontend/src/app/core/browser/browser-detector.service.ts
@@ -1,9 +1,9 @@
-import { Inject, Injectable, DOCUMENT } from '@angular/core';
+import { Injectable, DOCUMENT, inject } from '@angular/core';
 
 @Injectable({ providedIn: 'root' })
 export class BrowserDetector {
-  constructor(@Inject(DOCUMENT) private documentElement:Document) {
-  }
+  private documentElement = inject<Document>(DOCUMENT);
+
 
   /**
    * Detect mobile browser based on the Rails determined UA
diff --git a/frontend/src/app/core/config/configuration.service.ts b/frontend/src/app/core/config/configuration.service.ts
index ee186227657..e80fd50b9db 100644
--- a/frontend/src/app/core/config/configuration.service.ts
+++ b/frontend/src/app/core/config/configuration.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import moment from 'moment';
 
 import { ConfigurationResource } from 'core-app/features/hal/resources/configuration-resource';
@@ -35,15 +35,13 @@ import { type DurationFormat } from 'core-app/shared/helpers/chronic_duration';
 
 @Injectable({ providedIn: 'root' })
 export class ConfigurationService {
+  private readonly apiV3Service = inject(ApiV3Service);
+
   // fetches configuration from the ApiV3 endpoint
   // TODO: this currently saves the request between page reloads,
   // but could easily be stored in localStorage
   private configuration:ConfigurationResource;
 
-  public constructor(
-    private readonly apiV3Service:ApiV3Service,
-  ) { }
-
   public initialize():Promise<void> {
     return this.loadConfiguration();
   }
diff --git a/frontend/src/app/core/current-project/current-project.service.spec.ts b/frontend/src/app/core/current-project/current-project.service.spec.ts
index 59ada2ac281..7b8875827b1 100644
--- a/frontend/src/app/core/current-project/current-project.service.spec.ts
+++ b/frontend/src/app/core/current-project/current-project.service.spec.ts
@@ -26,7 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { TestBed } from '@angular/core/testing';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
+import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { CurrentProjectService } from './current-project.service';
 
 describe('currentProject service', () => {
@@ -40,7 +42,15 @@ describe('currentProject service', () => {
   };
 
   beforeEach(() => {
-    currentProject = new CurrentProjectService(new PathHelperService(), apiV3Stub);
+    TestBed.configureTestingModule({
+      providers: [
+        CurrentProjectService,
+        PathHelperService,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        { provide: ApiV3Service, useValue: apiV3Stub },
+      ],
+    });
+    currentProject = TestBed.inject(CurrentProjectService);
   });
 
   describe('with no meta present', () => {
diff --git a/frontend/src/app/core/current-project/current-project.service.ts b/frontend/src/app/core/current-project/current-project.service.ts
index da1425eda32..ad54323f4e6 100644
--- a/frontend/src/app/core/current-project/current-project.service.ts
+++ b/frontend/src/app/core/current-project/current-project.service.ts
@@ -26,21 +26,21 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { getMetaElement } from '../setup/globals/global-helpers';
 
 @Injectable({ providedIn: 'root' })
 export class CurrentProjectService {
+  private PathHelper = inject(PathHelperService);
+  private apiV3Service = inject(ApiV3Service);
+
   private currentId:string|null = null;
   private currentName:string|null = null;
   private currentIdentifier:string|null = null;
 
-  constructor(
-    private PathHelper:PathHelperService,
-    private apiV3Service:ApiV3Service,
-  ) {
+  constructor() {
     this.detect();
   }
 
diff --git a/frontend/src/app/core/current-user/current-user.module.ts b/frontend/src/app/core/current-user/current-user.module.ts
index 892368c3814..a26c8abb089 100644
--- a/frontend/src/app/core/current-user/current-user.module.ts
+++ b/frontend/src/app/core/current-user/current-user.module.ts
@@ -1,4 +1,4 @@
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 
 import { CurrentUserService } from './current-user.service';
 import { CurrentUserStore } from './current-user.store';
@@ -35,7 +35,9 @@ export function bootstrapModule(injector:Injector):void {
   ],
 })
 export class CurrentUserModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     bootstrapModule(injector);
   }
 }
diff --git a/frontend/src/app/core/current-user/current-user.query.ts b/frontend/src/app/core/current-user/current-user.query.ts
index dee37f6f36a..48e4bbddb6f 100644
--- a/frontend/src/app/core/current-user/current-user.query.ts
+++ b/frontend/src/app/core/current-user/current-user.query.ts
@@ -1,11 +1,17 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Query } from '@datorama/akita';
 import { CurrentUserState, CurrentUserStore } from './current-user.store';
 
 @Injectable()
 export class CurrentUserQuery extends Query<CurrentUserState> {
-  constructor(protected store:CurrentUserStore) {
+  protected store:CurrentUserStore;
+
+  constructor() {
+    const store = inject(CurrentUserStore);
+
     super(store);
+
+    this.store = store;
   }
 
   isLoggedIn$ = this.select((state) => !!state.loggedIn);
diff --git a/frontend/src/app/core/current-user/current-user.service.ts b/frontend/src/app/core/current-user/current-user.service.ts
index af5eeb3781a..ccdad8f88dc 100644
--- a/frontend/src/app/core/current-user/current-user.service.ts
+++ b/frontend/src/app/core/current-user/current-user.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { ApiV3ListFilter } from 'core-app/core/apiv3/paths/apiv3-list-resource.interface';
 import { CapabilitiesResourceService } from 'core-app/core/state/capabilities/capabilities.service';
@@ -38,12 +38,12 @@ import { CurrentUser, CurrentUserStore } from './current-user.store';
 
 @Injectable({ providedIn: 'root' })
 export class CurrentUserService {
-  constructor(
-    private apiV3Service:ApiV3Service,
-    private currentUserStore:CurrentUserStore,
-    private currentUserQuery:CurrentUserQuery,
-    private capabilitiesService:CapabilitiesResourceService,
-  ) {
+  private apiV3Service = inject(ApiV3Service);
+  private currentUserStore = inject(CurrentUserStore);
+  private currentUserQuery = inject(CurrentUserQuery);
+  private capabilitiesService = inject(CapabilitiesResourceService);
+
+  constructor() {
     this.setupLegacyDataListeners();
   }
 
diff --git a/frontend/src/app/core/datetime/timezone.service.ts b/frontend/src/app/core/datetime/timezone.service.ts
index a703ce1c616..d8c4b2bb398 100644
--- a/frontend/src/app/core/datetime/timezone.service.ts
+++ b/frontend/src/app/core/datetime/timezone.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import moment, { Moment } from 'moment-timezone';
@@ -34,10 +34,9 @@ import { outputChronicDuration } from '../../shared/helpers/chronic_duration';
 
 @Injectable({ providedIn: 'root' })
 export class TimezoneService {
-  constructor(
-    readonly configurationService:ConfigurationService,
-    readonly I18n:I18nService,
-  ) { }
+  readonly configurationService = inject(ConfigurationService);
+  readonly I18n = inject(I18nService);
+
 
   /**
    * Returns the user's configured timezone or guesses it through moment
diff --git a/frontend/src/app/core/days/weekday.service.ts b/frontend/src/app/core/days/weekday.service.ts
index ab91eb3cde5..2f5643b1fdb 100644
--- a/frontend/src/app/core/days/weekday.service.ts
+++ b/frontend/src/app/core/days/weekday.service.ts
@@ -26,10 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  Injectable,
-  Injector,
-} from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import moment, { Moment } from 'moment';
 import {
   take,
@@ -45,14 +42,12 @@ import {
 
 @Injectable({ providedIn: 'root' })
 export class WeekdayService {
+  readonly injector = inject(Injector);
+
   @InjectField() weekdaysService:WeekdayResourceService;
 
   private weekdays:IWeekday[];
 
-  constructor(
-    readonly injector:Injector,
-  ) {}
-
   /**
    * @param date The iso day number (1-7) or a date instance
    * @return {boolean} whether the given iso day is working or not
diff --git a/frontend/src/app/core/enterprise/banners.service.ts b/frontend/src/app/core/enterprise/banners.service.ts
index a8c39e57b33..92c06a214b5 100644
--- a/frontend/src/app/core/enterprise/banners.service.ts
+++ b/frontend/src/app/core/enterprise/banners.service.ts
@@ -26,18 +26,20 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Inject, Injectable, DOCUMENT } from '@angular/core';
+import { Injectable, DOCUMENT, inject } from '@angular/core';
 import { enterpriseEditionUrl } from 'core-app/core/setup/globals/constants.const';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 
 @Injectable({ providedIn: 'root' })
 export class BannersService {
+  protected documentElement = inject<Document>(DOCUMENT);
+  protected configuration = inject(ConfigurationService);
+
   private readonly _bannersHidden:boolean = true;
 
-  constructor(
-    @Inject(DOCUMENT) protected documentElement:Document,
-    protected configuration:ConfigurationService,
-  ) {
+  constructor() {
+    const documentElement = this.documentElement;
+
     this._bannersHidden = documentElement.body.classList.contains('ee-banners-hidden');
   }
 
diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.ts b/frontend/src/app/core/global_search/input/global-search-input.component.ts
index 83c2b43deeb..5f693bd1728 100644
--- a/frontend/src/app/core/global_search/input/global-search-input.component.ts
+++ b/frontend/src/app/core/global_search/input/global-search-input.component.ts
@@ -1,16 +1,5 @@
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostListener,
-  Input,
-  OnDestroy,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostListener, Input, OnDestroy, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { first, map, switchMap, tap } from 'rxjs/operators';
 import { GlobalSearchService } from 'core-app/core/global_search/services/global-search.service';
@@ -74,6 +63,18 @@ interface SearchResultItems {
   standalone: false,
 })
 export class GlobalSearchInputComponent implements AfterViewInit, OnDestroy {
+  readonly elementRef = inject(ElementRef);
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly pathHelperService = inject(PathHelperService);
+  readonly halResourceService = inject(HalResourceService);
+  readonly globalSearchService = inject(GlobalSearchService);
+  readonly currentProjectService = inject(CurrentProjectService);
+  readonly deviceService = inject(DeviceService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly recentItemsService = inject(RecentItemsService);
+
   @Input() public placeholder:string;
 
   @ViewChild('btn', { static: true }) btn:ElementRef;
@@ -131,19 +132,7 @@ export class GlobalSearchInputComponent implements AfterViewInit, OnDestroy {
     search: this.I18n.t('js.autocompleter.search'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly pathHelperService:PathHelperService,
-    readonly halResourceService:HalResourceService,
-    readonly globalSearchService:GlobalSearchService,
-    readonly currentProjectService:CurrentProjectService,
-    readonly deviceService:DeviceService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly halNotification:HalResourceNotificationService,
-    readonly recentItemsService:RecentItemsService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/core/global_search/openproject-global-search.module.ts b/frontend/src/app/core/global_search/openproject-global-search.module.ts
index f8b8ebbfd56..259e7394642 100644
--- a/frontend/src/app/core/global_search/openproject-global-search.module.ts
+++ b/frontend/src/app/core/global_search/openproject-global-search.module.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { OpenprojectWorkPackagesModule } from 'core-app/features/work-packages/openproject-work-packages.module';
 import { GlobalSearchInputComponent } from 'core-app/core/global_search/input/global-search-input.component';
 import { GlobalSearchWorkPackagesComponent } from 'core-app/core/global_search/global-search-work-packages.component';
@@ -53,6 +53,5 @@ import { RecentItemsService } from 'core-app/core/recent-items.service';
   ],
 })
 export class OpenprojectGlobalSearchModule {
-  constructor(readonly injector:Injector) {
-  }
+  readonly injector = inject(Injector);
 }
diff --git a/frontend/src/app/core/global_search/services/global-search.service.ts b/frontend/src/app/core/global_search/services/global-search.service.ts
index 38f17e17697..7ded727590b 100644
--- a/frontend/src/app/core/global_search/services/global-search.service.ts
+++ b/frontend/src/app/core/global_search/services/global-search.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 
@@ -34,13 +34,11 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
 
 @Injectable()
 export class GlobalSearchService {
-  constructor(
-    protected I18n:I18nService,
-    protected injector:Injector,
-    protected PathHelper:PathHelperService,
-    protected currentProjectService:CurrentProjectService,
-  ) {
-  }
+  protected I18n = inject(I18nService);
+  protected injector = inject(Injector);
+  protected PathHelper = inject(PathHelperService);
+  protected currentProjectService = inject(CurrentProjectService);
+
 
   public submitSearch(query:string, scope:string):void {
     const path = this.searchPath(scope);
diff --git a/frontend/src/app/core/global_search/tabs/global-search-tabs.component.ts b/frontend/src/app/core/global_search/tabs/global-search-tabs.component.ts
index 4c1392c5143..ee600bddab1 100644
--- a/frontend/src/app/core/global_search/tabs/global-search-tabs.component.ts
+++ b/frontend/src/app/core/global_search/tabs/global-search-tabs.component.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnDestroy, OnInit } from '@angular/core';
-import { StateService } from '@uirouter/core';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, inject } from '@angular/core';
 import { Subscription } from 'rxjs';
 import { GlobalSearchService } from 'core-app/core/global_search/services/global-search.service';
 import { ScrollableTabsComponent } from 'core-app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component';
@@ -40,20 +39,13 @@ import { TabDefinition } from 'core-app/shared/components/tabs/tab.interface';
   standalone: false,
 })
 export class GlobalSearchTabsComponent extends ScrollableTabsComponent implements OnInit, OnDestroy {
+  readonly globalSearchService = inject(GlobalSearchService);
+
   private currentTabSub:Subscription;
 
   private tabsSub:Subscription;
 
-  public classes:string[] = ['global-search--tabs', 'scrollable-tabs'];
-
-  constructor(
-    readonly globalSearchService:GlobalSearchService,
-    protected readonly $state:StateService,
-    public injector:Injector,
-    cdRef:ChangeDetectorRef,
-  ) {
-    super($state, cdRef, injector);
-  }
+  public override classes:string[] = ['global-search--tabs', 'scrollable-tabs'];
 
   ngOnInit():void {
     this.currentTabSub = this.globalSearchService
diff --git a/frontend/src/app/core/html-sanitize/html-sanitize.service.ts b/frontend/src/app/core/html-sanitize/html-sanitize.service.ts
index f6007f4e02b..237539d18f8 100644
--- a/frontend/src/app/core/html-sanitize/html-sanitize.service.ts
+++ b/frontend/src/app/core/html-sanitize/html-sanitize.service.ts
@@ -26,12 +26,13 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, SecurityContext } from '@angular/core';
+import { Injectable, SecurityContext, inject } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 
 @Injectable({ providedIn: 'root' })
 export class HTMLSanitizeService {
-  public constructor(readonly sanitizer:DomSanitizer) { }
+  readonly sanitizer = inject(DomSanitizer);
+
 
   public sanitize(string:string):SafeHtml {
     return this.sanitizer.sanitize(SecurityContext.HTML, string) || '';
diff --git a/frontend/src/app/core/html/op-title.service.ts b/frontend/src/app/core/html/op-title.service.ts
index fc6a500ecb2..5c56c9b920d 100644
--- a/frontend/src/app/core/html/op-title.service.ts
+++ b/frontend/src/app/core/html/op-title.service.ts
@@ -1,13 +1,13 @@
 import { Title } from '@angular/platform-browser';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { getMetaContent } from '../setup/globals/global-helpers';
 
 const titlePartsSeparator = ' | ';
 
 @Injectable({ providedIn: 'root' })
 export class OpTitleService {
-  constructor(private titleService:Title) {
-  }
+  private titleService = inject(Title);
+
 
   public get current():string {
     return this.titleService.getTitle();
diff --git a/frontend/src/app/core/i18n/i18n.service.ts b/frontend/src/app/core/i18n/i18n.service.ts
index 76cdf244165..5c97407f543 100644
--- a/frontend/src/app/core/i18n/i18n.service.ts
+++ b/frontend/src/app/core/i18n/i18n.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { NgSelectConfig } from '@ng-select/ng-select';
 import { I18n } from 'i18n-js';
 import { FormatNumberOptions, TranslateOptions } from 'i18n-js/src/typing';
@@ -6,12 +6,12 @@ import { getMetaValue } from '../setup/globals/global-helpers';
 
 @Injectable({ providedIn: 'root' })
 export class I18nService {
+  private config = inject(NgSelectConfig);
+
   private i18n:I18n = window.I18n;
   private instanceLocale:string;
 
-  constructor(
-    private config:NgSelectConfig,
-  ) {
+  constructor() {
     this.instanceLocale = getMetaValue('openproject_initializer', 'instanceLocale', 'en');
 
     this.config.addTagText = this.t('js.autocomplete_ng_select.add_tag');
diff --git a/frontend/src/app/core/main-menu/main-menu-toggle.service.ts b/frontend/src/app/core/main-menu/main-menu-toggle.service.ts
index 3e7fbee0bce..4c17bc260eb 100644
--- a/frontend/src/app/core/main-menu/main-menu-toggle.service.ts
+++ b/frontend/src/app/core/main-menu/main-menu-toggle.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { DeviceService } from 'core-app/core/browser/device.service';
@@ -35,6 +35,9 @@ import { queryVisible } from 'core-app/shared/helpers/dom-helpers';
 
 @Injectable({ providedIn: 'root' })
 export class MainMenuToggleService {
+  injector = inject(Injector);
+  readonly deviceService = inject(DeviceService);
+
   private elementWidth:number;
 
   private elementMinWidth = 11;
@@ -61,10 +64,7 @@ export class MainMenuToggleService {
 
   private wasCollapsedByUser = false;
 
-  constructor(
-    public injector:Injector,
-    readonly deviceService:DeviceService,
-  ) {
+  constructor() {
     this.initializeMenu();
     // Add resize event listener
     window.addEventListener('resize', this.onWindowResize.bind(this));
diff --git a/frontend/src/app/core/main-menu/submenu.service.ts b/frontend/src/app/core/main-menu/submenu.service.ts
index 5ad6678b260..ce4f97f081b 100644
--- a/frontend/src/app/core/main-menu/submenu.service.ts
+++ b/frontend/src/app/core/main-menu/submenu.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { type FrameElement } from '@hotwired/turbo';
 import { StateService } from '@uirouter/core';
 
 @Injectable({ providedIn: 'root' })
 export class SubmenuService {
-  constructor(protected $state:StateService) {}
+  protected $state = inject(StateService);
+
 
   reloadSubmenu(selectedQueryId:string|null, sidemenuId?:string):void {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
diff --git a/frontend/src/app/core/navigation/url-params.service.ts b/frontend/src/app/core/navigation/url-params.service.ts
index 7cf07168c82..007a6d0b696 100644
--- a/frontend/src/app/core/navigation/url-params.service.ts
+++ b/frontend/src/app/core/navigation/url-params.service.ts
@@ -26,15 +26,15 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay, startWith } from 'rxjs/operators';
 import { NavigationService } from 'core-app/core/navigation/navigation.service';
 
 @Injectable({ providedIn: 'root' })
 export class UrlParamsService {
-  constructor(private navigation:NavigationService) {
-  }
+  private navigation = inject(NavigationService);
+
 
   public get(key:string):string|null {
     return this.searchParams.get(key);
diff --git a/frontend/src/app/core/routing/openproject-router.module.ts b/frontend/src/app/core/routing/openproject-router.module.ts
index 23e76ba35f7..33c6024ce70 100644
--- a/frontend/src/app/core/routing/openproject-router.module.ts
+++ b/frontend/src/app/core/routing/openproject-router.module.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { FirstRouteService } from 'core-app/core/routing/first-route-service';
 import { UIRouterModule } from '@uirouter/angular';
 import { ApplicationBaseComponent } from 'core-app/core/routing/base/application-base.component';
@@ -52,7 +52,9 @@ import {
   ],
 })
 export class OpenprojectRouterModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeUiRouterListeners(injector);
   }
 }
diff --git a/frontend/src/app/core/schemas/schema-cache.service.ts b/frontend/src/app/core/schemas/schema-cache.service.ts
index c7583d096d7..6bd5a4e6be9 100644
--- a/frontend/src/app/core/schemas/schema-cache.service.ts
+++ b/frontend/src/app/core/schemas/schema-cache.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 import { State } from '@openproject/reactivestates';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { StateCacheService } from 'core-app/core/apiv3/cache/state-cache.service';
 import { firstValueFrom, Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -41,13 +41,17 @@ export const fallbackSchemaId = '__fallback';
 
 @Injectable()
 export class SchemaCacheService extends StateCacheService<SchemaResource> {
+  readonly states:States;
+  readonly halResourceService = inject(HalResourceService);
+
   fallbackSchema = this.halResourceService.createHalResourceOfClass<SchemaResource>(SchemaResource, {}, true);
 
-  constructor(
-    readonly states:States,
-    readonly halResourceService:HalResourceService,
-  ) {
+  constructor() {
+    const states = inject(States);
+
     super(states.schemas);
+    this.states = states;
+
     this.putValue(fallbackSchemaId, this.fallbackSchema);
   }
 
diff --git a/frontend/src/app/core/setup/globals/components/admin/backup.component.ts b/frontend/src/app/core/setup/globals/components/admin/backup.component.ts
index 46526cbc238..2120d61fcf2 100644
--- a/frontend/src/app/core/setup/globals/components/admin/backup.component.ts
+++ b/frontend/src/app/core/setup/globals/components/admin/backup.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Injector, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Injector, ViewChild, inject } from '@angular/core';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
@@ -43,6 +43,13 @@ import { JobStatusModalService } from 'core-app/features/job-status/job-status-m
   standalone: false,
 })
 export class BackupComponent implements AfterViewInit {
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  injector = inject(Injector);
+  protected i18n = inject(I18nService);
+  protected toastService = inject(ToastService);
+  protected pathHelper = inject(PathHelperService);
+  protected jobStatusModalService = inject(JobStatusModalService);
+
   public text = {
     info: this.i18n.t('js.backup.info'),
     note: this.i18n.t('js.backup.note'),
@@ -72,14 +79,7 @@ export class BackupComponent implements AfterViewInit {
 
   @ViewChild('backupTokenInput') backupTokenInput:ElementRef<HTMLInputElement>;
 
-  constructor(
-    readonly elementRef:ElementRef<HTMLElement>,
-    public injector:Injector,
-    protected i18n:I18nService,
-    protected toastService:ToastService,
-    protected pathHelper:PathHelperService,
-    protected jobStatusModalService:JobStatusModalService,
-  ) {
+  constructor() {
     this.includeAttachments = this.mayIncludeAttachments;
   }
 
diff --git a/frontend/src/app/core/state/resource-store.service.ts b/frontend/src/app/core/state/resource-store.service.ts
index 144beb68281..629a745cd21 100644
--- a/frontend/src/app/core/state/resource-store.service.ts
+++ b/frontend/src/app/core/state/resource-store.service.ts
@@ -58,10 +58,7 @@ import {
   HttpClient,
   HttpErrorResponse,
 } from '@angular/common/http';
-import {
-  Injectable,
-  Injector,
-} from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import idFromLink from 'core-app/features/hal/helpers/id-from-link';
@@ -76,18 +73,15 @@ export type ResourceKeyInput = ApiV3ListParameters|string;
 
 @Injectable()
 export abstract class ResourceStoreService<T extends { id:ID }> {
+  readonly injector = inject(Injector);
+  readonly http = inject(HttpClient);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly toastService = inject(ToastService);
+
   protected store:ResourceStore<T> = this.createStore();
 
   protected query = new QueryEntity(this.store);
 
-  constructor(
-    readonly injector:Injector,
-    readonly http:HttpClient,
-    readonly apiV3Service:ApiV3Service,
-    readonly toastService:ToastService,
-  ) {
-  }
-
   /**
    * Require the results for the given filter params
    * Returns a cached set if it was loaded already.
diff --git a/frontend/src/app/core/state/storage-files/storage-files.service.ts b/frontend/src/app/core/state/storage-files/storage-files.service.ts
index dd8718b7bde..15c65224362 100644
--- a/frontend/src/app/core/state/storage-files/storage-files.service.ts
+++ b/frontend/src/app/core/state/storage-files/storage-files.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { combineLatest, Observable } from 'rxjs';
 import {
   filter, map, take, tap,
@@ -44,15 +44,13 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 
 @Injectable()
 export class StorageFilesResourceService {
+  private readonly httpClient = inject(HttpClient);
+  private readonly apiV3Service = inject(ApiV3Service);
+
   private readonly store:StorageFilesStore = new StorageFilesStore();
 
   private readonly query = new QueryEntity(this.store);
 
-  constructor(
-    private readonly httpClient:HttpClient,
-    private readonly apiV3Service:ApiV3Service,
-  ) {}
-
   files(link:IHalResourceLink):Observable<IStorageFiles> {
     const value = this.store.getValue().files[link.href];
     if (value !== undefined) {
diff --git a/frontend/src/app/core/top-menu/top-menu.service.ts b/frontend/src/app/core/top-menu/top-menu.service.ts
index d05a13645aa..283fcc34f26 100644
--- a/frontend/src/app/core/top-menu/top-menu.service.ts
+++ b/frontend/src/app/core/top-menu/top-menu.service.ts
@@ -26,10 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  Inject,
-  Injectable,
-} from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { isVisible } from 'core-app/shared/helpers/dom-helpers';
 
@@ -37,8 +34,8 @@ export const ANIMATION_RATE_MS = 100;
 
 @Injectable({ providedIn: 'root' })
 export class TopMenuService {
-  constructor(@Inject(DOCUMENT) private document:Document) {
-  }
+  private document = inject<Document>(DOCUMENT);
+
 
   register():void {
     this.skipContentClickListener();
diff --git a/frontend/src/app/core/turbo/turbo-requests.service.ts b/frontend/src/app/core/turbo/turbo-requests.service.ts
index a1a40087ddc..5afe6bbd1f0 100644
--- a/frontend/src/app/core/turbo/turbo-requests.service.ts
+++ b/frontend/src/app/core/turbo/turbo-requests.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { renderStreamMessage } from '@hotwired/turbo';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { debugLog } from 'core-app/shared/helpers/debug_output';
@@ -7,14 +7,10 @@ import { getMetaContent } from '../setup/globals/global-helpers';
 
 @Injectable({ providedIn: 'root' })
 export class TurboRequestsService {
+  private toast = inject(ToastService);
+
   #controllers = new Map<string, AbortController>();
 
-  constructor(
-    private toast:ToastService,
-  ) {
-
-  }
-
   public request(
     url:string,
     init:RequestInit = {},
diff --git a/frontend/src/app/features/admin/editable-query-props/editable-query-props.component.ts b/frontend/src/app/features/admin/editable-query-props/editable-query-props.component.ts
index 07f0895d492..18bc34b5649 100644
--- a/frontend/src/app/features/admin/editable-query-props/editable-query-props.component.ts
+++ b/frontend/src/app/features/admin/editable-query-props/editable-query-props.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   ExternalQueryConfigurationService,
@@ -11,6 +11,11 @@ import {
   standalone: false,
 })
 export class EditableQueryPropsComponent implements OnInit {
+  private elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  private I18n = inject(I18nService);
+  private cdRef = inject(ChangeDetectorRef);
+  private externalQuery = inject(ExternalQueryConfigurationService);
+
   id:string|null;
 
   name:string|null;
@@ -23,14 +28,6 @@ export class EditableQueryPropsComponent implements OnInit {
     edit_query: this.I18n.t('js.admin.type_form.edit_query'),
   };
 
-  constructor(
-    private elementRef:ElementRef<HTMLElement>,
-    private I18n:I18nService,
-    private cdRef:ChangeDetectorRef,
-    private externalQuery:ExternalQueryConfigurationService,
-  ) {
-  }
-
   ngOnInit() {
     const element = this.elementRef.nativeElement;
     this.id = element.dataset.id!;
diff --git a/frontend/src/app/features/admin/openproject-admin.module.ts b/frontend/src/app/features/admin/openproject-admin.module.ts
index db7c1865fb0..1406b31c49f 100644
--- a/frontend/src/app/features/admin/openproject-admin.module.ts
+++ b/frontend/src/app/features/admin/openproject-admin.module.ts
@@ -28,25 +28,15 @@
 
 import { NgModule } from '@angular/core';
 import { OpSharedModule } from 'core-app/shared/shared.module';
-import { DragulaModule } from 'ng2-dragula';
-import { TypeFormAttributeGroupComponent } from 'core-app/features/admin/types/attribute-group.component';
-import { TypeFormConfigurationComponent } from 'core-app/features/admin/types/type-form-configuration.component';
-import { TypeFormQueryGroupComponent } from 'core-app/features/admin/types/query-group.component';
-import { GroupEditInPlaceComponent } from 'core-app/features/admin/types/group-edit-in-place.component';
 import { EditableQueryPropsComponent } from 'core-app/features/admin/editable-query-props/editable-query-props.component';
 
 @NgModule({
   imports: [
-    DragulaModule.forRoot(),
     OpSharedModule,
   ],
   providers: [
   ],
   declarations: [
-    TypeFormAttributeGroupComponent,
-    TypeFormQueryGroupComponent,
-    TypeFormConfigurationComponent,
-    GroupEditInPlaceComponent,
     EditableQueryPropsComponent,
   ],
 })
diff --git a/frontend/src/app/features/admin/types/attribute-group.component.html b/frontend/src/app/features/admin/types/attribute-group.component.html
deleted file mode 100644
index db088a299e8..00000000000
--- a/frontend/src/app/features/admin/types/attribute-group.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="type-form-conf-group">
-  <div class="group-head">
-    <span class="group-handle icon-drag-handle"></span>
-    <op-group-edit-in-place [name]="group.name"
-      (onValueChange)="rename($event)"
-      class="group-name" />
-      <primer-icon-button
-        icon="x"
-        scheme="invisible"
-        size="small"
-        class="delete-group"
-        tooltip-direction="w"
-        [label]="text.delete_group"
-        (clicked)="deleteGroup.emit()"
-      />
-  </div>
-  <div class="attributes" dragula="attributes" [(dragulaModel)]="group.attributes">
-    @for (attribute of group.attributes; track attribute) {
-      <div
-        class="type-form-conf-attribute"
-        [attr.data-key]="attribute.key">
-        <span class="attribute-handle icon-drag-handle"></span>
-        <span class="attribute-name">
-          {{ attribute.translation }}
-          @if (attribute.is_cf) {
-            <span class="attribute-cf-label"
-              [textContent]="text.custom_field">
-            </span>
-          }
-        </span>
-        <primer-icon-button
-          icon="x"
-          scheme="invisible"
-          size="small"
-          class="delete-attribute"
-          tooltip-direction="w"
-          [label]="text.remove_attribute"
-          (clicked)="removeFromGroup(attribute)"
-        />
-      </div>
-    }
-  </div>
-</div> <!-- END attribute group -->
diff --git a/frontend/src/app/features/admin/types/attribute-group.component.ts b/frontend/src/app/features/admin/types/attribute-group.component.ts
deleted file mode 100644
index 69d2aa29828..00000000000
--- a/frontend/src/app/features/admin/types/attribute-group.component.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { TypeFormAttribute, TypeGroup } from 'core-app/features/admin/types/type-form-configuration.component';
-
-@Component({
-  selector: 'op-type-form-attribute-group',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  templateUrl: './attribute-group.component.html',
-  standalone: false,
-})
-export class TypeFormAttributeGroupComponent {
-  @Input() public group:TypeGroup;
-
-  @Output() public deleteGroup = new EventEmitter<void>();
-
-  @Output() public removeAttribute = new EventEmitter<TypeFormAttribute>();
-
-  text = {
-    custom_field: this.I18n.t('js.admin.type_form.custom_field'),
-    delete_group: this.I18n.t('js.admin.type_form.delete_group'),
-    remove_attribute: this.I18n.t('js.admin.type_form.remove_attribute')
-  };
-
-  constructor(private I18n:I18nService,
-    private cdRef:ChangeDetectorRef) {
-  }
-
-  rename(newValue:string) {
-    this.group.name = newValue;
-    delete this.group.key;
-    this.cdRef.detectChanges();
-  }
-
-  removeFromGroup(attribute:TypeFormAttribute) {
-    this.group.attributes = this.group.attributes.filter((a) => a !== attribute);
-    this.removeAttribute.emit(attribute);
-  }
-}
diff --git a/frontend/src/app/features/admin/types/group-edit-in-place.component.ts b/frontend/src/app/features/admin/types/group-edit-in-place.component.ts
deleted file mode 100644
index fd0bcdad58d..00000000000
--- a/frontend/src/app/features/admin/types/group-edit-in-place.component.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-//-- copyright
-// OpenProject is an open source project management software.
-// Copyright (C) the OpenProject GmbH
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2013 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// See COPYRIGHT and LICENSE files for more details.
-//++
-
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-} from '@angular/core';
-import { TypeBannerService } from 'core-app/features/admin/types/type-banner.service';
-
-@Component({
-  selector: 'op-group-edit-in-place',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  templateUrl: './group-edit-in-place.html',
-  standalone: false,
-})
-export class GroupEditInPlaceComponent implements OnInit {
-  @Input() public placeholder = '';
-
-  @Input() public name:string;
-
-  @Output() public onValueChange = new EventEmitter<string>();
-
-  public editing = false;
-
-  public editedName:string;
-
-  constructor(private bannerService:TypeBannerService,
-    protected readonly cdRef:ChangeDetectorRef) {
-  }
-
-  ngOnInit():void {
-    this.editedName = this.name;
-
-    if (!this.name || this.name.length === 0) {
-      // Group name is empty so open in editing mode straight away.
-      this.startEditing();
-    }
-  }
-
-  startEditing():void {
-    void this.bannerService.conditional(
-      'edit_attribute_groups',
-      () => this.bannerService.showEEOnlyHint(),
-      () => {
-        this.editing = true;
-        this.cdRef.detectChanges();
-      },
-    );
-  }
-
-  saveEdition(event:FocusEvent):boolean {
-    this.leaveEditingMode();
-    this.name = this.editedName.trim();
-
-    this.cdRef.detectChanges();
-
-    if (this.name !== '') {
-      this.onValueChange.emit(this.name);
-    }
-
-    // Ensure form is not submitted.
-    event.preventDefault();
-    event.stopPropagation();
-    return false;
-  }
-
-  reset():void {
-    this.editing = false;
-    this.editedName = this.name;
-  }
-
-  leaveEditingMode():void {
-    // Only leave Editing mode if name not empty.
-    if (this.editedName != null && this.editedName.trim().length > 0) {
-      this.editing = false;
-    }
-  }
-}
diff --git a/frontend/src/app/features/admin/types/group-edit-in-place.html b/frontend/src/app/features/admin/types/group-edit-in-place.html
deleted file mode 100644
index 6049b310fd3..00000000000
--- a/frontend/src/app/features/admin/types/group-edit-in-place.html
+++ /dev/null
@@ -1,23 +0,0 @@
-@if (!editing) {
-  <div
-    role="button"
-    tabindex="0"
-    class="group-edit-handler"
-    [textContent]="name"
-    (click)="startEditing()"
-    (keydown.enter)="startEditing()"
-    (keydown.space)="startEditing()">
-  </div>
-}
-@if (editing) {
-  <input
-    #nameInput
-    class="group-edit-in-place--input"
-    type="text"
-    opAutofocus
-    [(ngModel)]="editedName"
-    [attr.placeholder]="placeholder"
-    (blur)="saveEdition($event)"
-    (keydown.escape)="reset()"
-    (keydown.enter)="saveEdition($event)">
-}
diff --git a/frontend/src/app/features/admin/types/query-group.component.html b/frontend/src/app/features/admin/types/query-group.component.html
deleted file mode 100644
index 47e6afddaa3..00000000000
--- a/frontend/src/app/features/admin/types/query-group.component.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="type-form-conf-group type-form-query-group">
-    <div class="group-head">
-        <span class="group-handle icon-drag-handle"></span>
-        <op-group-edit-in-place [name]="group.name"
-                (onValueChange)="rename($event)"
-                class="group-name" />
-        <primer-icon-button
-          icon="x"
-          scheme="invisible"
-          size="small"
-          class="delete-group"
-          tooltip-direction="w"
-          [label]="text.delete_group"
-          (clicked)="deleteGroup.emit()"
-        />
-    </div>
-    <div class="type-form-query">
-        <span class="type-form-query-group--edit-button"
-              role="button"
-              tabindex="0"
-              (click)="editQuery.emit()"
-              (keydown.enter)="editQuery.emit()"
-              (keydown.space)="editQuery.emit()">
-          <op-icon icon-classes="button--icon icon-edit" />
-            {{ text.edit_query }}
-        </span>
-    </div>
-</div> <!-- END query group -->
diff --git a/frontend/src/app/features/admin/types/query-group.component.ts b/frontend/src/app/features/admin/types/query-group.component.ts
deleted file mode 100644
index b88cc3f8327..00000000000
--- a/frontend/src/app/features/admin/types/query-group.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { TypeGroup } from 'core-app/features/admin/types/type-form-configuration.component';
-
-@Component({
-  selector: 'op-type-form-query-group',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  templateUrl: './query-group.component.html',
-  standalone: false,
-})
-export class TypeFormQueryGroupComponent {
-  text = {
-    edit_query: this.I18n.t('js.admin.type_form.edit_query'),
-    delete_group: this.I18n.t('js.admin.type_form.delete_group')
-  };
-
-  @Input() public group:TypeGroup;
-
-  @Output() public editQuery = new EventEmitter<void>();
-
-  @Output() public deleteGroup = new EventEmitter<void>();
-
-  constructor(private I18n:I18nService,
-    private cdRef:ChangeDetectorRef) {
-  }
-
-  rename(newValue:string):void {
-    this.group.name = newValue;
-    this.cdRef.detectChanges();
-  }
-}
diff --git a/frontend/src/app/features/admin/types/type-banner.service.ts b/frontend/src/app/features/admin/types/type-banner.service.ts
deleted file mode 100644
index 9878c8a155d..00000000000
--- a/frontend/src/app/features/admin/types/type-banner.service.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { BannersService } from 'core-app/core/enterprise/banners.service';
-import { Inject, Injectable, DOCUMENT } from '@angular/core';
-import { ConfirmDialogService } from 'core-app/shared/components/modals/confirm-dialog/confirm-dialog.service';
-import { ConfigurationService } from 'core-app/core/config/configuration.service';
-
-@Injectable()
-export class TypeBannerService extends BannersService {
-  eeAvailable = this.allowsTo('edit_attribute_groups');
-
-  constructor(
-    @Inject(DOCUMENT) protected documentElement:Document,
-    protected confirmDialog:ConfirmDialogService,
-    protected I18n:I18nService,
-    protected configuration:ConfigurationService,
-  ) {
-    super(documentElement, configuration);
-  }
-
-  showEEOnlyHint():void {
-    this.confirmDialog.confirm({
-      text: {
-        title: this.I18n.t('js.types.attribute_groups.upgrade_to_ee'),
-        text: this.I18n.t('js.types.attribute_groups.upgrade_to_ee_text'),
-        button_continue: this.I18n.t('js.types.attribute_groups.more_information'),
-        button_cancel: this.I18n.t('js.types.attribute_groups.nevermind'),
-      },
-    }).then(() => {
-      window.location.href = 'https://www.openproject.org/enterprise-edition/?utm_source=unknown&utm_medium=community-edition&utm_campaign=form-configuration';
-    })
-      .catch(() => {
-      });
-  }
-}
diff --git a/frontend/src/app/features/admin/types/type-form-configuration.component.ts b/frontend/src/app/features/admin/types/type-form-configuration.component.ts
deleted file mode 100644
index f361ec1c45c..00000000000
--- a/frontend/src/app/features/admin/types/type-form-configuration.component.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  OnDestroy,
-  OnInit
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import {
-  ExternalRelationQueryConfigurationService,
-} from 'core-app/features/work-packages/components/wp-table/external-configuration/external-relation-query-configuration.service';
-import { DomAutoscrollService } from 'core-app/shared/helpers/drag-and-drop/dom-autoscroll.service';
-import { DragulaService, DrakeWithModels } from 'ng2-dragula';
-import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
-import { installMenuLogic } from 'core-app/core/setup/globals/global-listeners/action-menu';
-import { ConfirmDialogService } from 'core-app/shared/components/modals/confirm-dialog/confirm-dialog.service';
-import { TypeBannerService } from 'core-app/features/admin/types/type-banner.service';
-
-export type TypeGroupType = 'attribute'|'query';
-
-export interface TypeFormAttribute {
-  key:string;
-  translation:string;
-  is_cf:boolean;
-}
-
-export interface TypeGroup {
-  /** original internal key, if any */
-  key:string|null|undefined;
-  /** Localized / given name */
-  name:string;
-  attributes:TypeFormAttribute[];
-  query?:any;
-  type:TypeGroupType;
-}
-
-export const emptyTypeGroup = '__empty';
-
-@Component({
-  selector: 'opce-admin-type-form-configuration',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  templateUrl: './type-form-configuration.html',
-  providers: [
-    TypeBannerService,
-    DragulaService
-  ],
-  standalone: false,
-})
-export class TypeFormConfigurationComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit, OnDestroy {
-  public text = {
-    drag_to_activate: this.I18n.t('js.admin.type_form.drag_to_activate'),
-    reset: this.I18n.t('js.admin.type_form.reset_to_defaults'),
-    label_group: this.I18n.t('js.label_group'),
-    new_group: this.I18n.t('js.admin.type_form.new_group'),
-    label_inactive: this.I18n.t('js.admin.type_form.inactive'),
-    custom_field: this.I18n.t('js.admin.type_form.custom_field'),
-    add_group: this.I18n.t('js.admin.type_form.add_group'),
-    add_table: this.I18n.t('js.admin.type_form.add_table'),
-  };
-
-  private autoscroll:any;
-
-  private element:HTMLElement;
-
-  private form:HTMLFormElement;
-
-  private submit:HTMLButtonElement;
-
-  public groups:TypeGroup[] = [];
-
-  public inactives:TypeFormAttribute[] = [];
-
-  private attributeDrake:DrakeWithModels;
-
-  private groupsDrake:DrakeWithModels;
-
-  private no_filter_query:string;
-
-  private eventListeners = {
-    typeFormUpdater: () => {
-      this.updateHiddenFields();
-    }
-  };
-
-  constructor(
-    private elementRef:ElementRef<HTMLElement>,
-    private I18n:I18nService,
-    private dragula:DragulaService,
-    private confirmDialog:ConfirmDialogService,
-    private externalRelationQuery:ExternalRelationQueryConfigurationService,
-    readonly typeBanner:TypeBannerService,
-  ) {
-    super();
-  }
-
-  ngOnInit():void {
-    // For unclear reasons, this component is initialized twice if used in conjunction with
-    // turbo drive. This then leads to the groups defined in this component being duplicated.
-    // It does not harm to remove them if they exist but it would of course be better if that hack
-    // would not be necessary. The functionality should all be handled in ngOnDestroy.
-    this.dragula.destroy('groups');
-    this.dragula.destroy('attributes');
-
-    // Hook on form submit
-    this.element = this.elementRef.nativeElement;
-    this.no_filter_query = this.element.dataset.noFilterQuery!;
-    this.form = this.element.closest('form')!;
-    this.submit = this.form.querySelector('.form-configuration--save')!;
-
-    // Capture regular form submit
-    this.form.addEventListener('submit', this.eventListeners.typeFormUpdater);
-
-    // Setup groups
-    this.groupsDrake = this
-      .dragula
-      .createGroup('groups', {
-        moves: (el, source, handle:HTMLElement) => handle.classList.contains('group-handle'),
-      })
-      .drake;
-
-    // Setup attributes
-    this.attributeDrake = this
-      .dragula
-      .createGroup('attributes', {
-        moves: (el, source, handle:HTMLElement) => handle.classList.contains('attribute-handle'),
-      })
-      .drake;
-
-    // Get attribute id
-    this.groups = JSON
-      .parse(this.element.dataset.activeGroups!)
-      .filter((group:TypeGroup) => group?.key !== emptyTypeGroup);
-    this.inactives = JSON.parse(this.element.dataset.inactiveAttributes!);
-
-    // Setup autoscroll
-    const that = this;
-    this.autoscroll = new DomAutoscrollService(
-      [
-        document.getElementById('content-body')!,
-      ],
-      {
-        margin: 25,
-        maxSpeed: 10,
-        scrollWhenOutside: true,
-        autoScroll(this:any) {
-          const groups = that.groupsDrake && that.groupsDrake.dragging;
-          const attributes = that.attributeDrake && that.attributeDrake.dragging;
-
-          return groups || attributes;
-        },
-      },
-    );
-  }
-
-  ngAfterViewInit():void {
-    const menu = this.elementRef.nativeElement.querySelector<HTMLElement>('.toolbar-items')!;
-    installMenuLogic(menu);
-  }
-
-  ngOnDestroy():void {
-    this.dragula.destroy('groups');
-    this.dragula.destroy('attributes');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
-    this.autoscroll.destroy();
-  }
-
-  deactivateAttribute(attribute:TypeFormAttribute):void {
-    this.updateInactives(this.inactives.concat(attribute));
-  }
-
-  addGroupAndOpenQuery():void {
-    const newGroup = this.createGroup('query');
-    this.editQuery(newGroup);
-  }
-
-  editQuery(group:TypeGroup):void {
-    void this.typeBanner.conditional(
-      'edit_attribute_groups',
-      () => this.typeBanner.showEEOnlyHint(),
-      () => {
-        // Disable display mode and timeline for now since we don't want users to enable it
-        const disabledTabs = {
-          'display-settings': I18n.t('js.work_packages.table_configuration.embedded_tab_disabled'),
-          timelines: I18n.t('js.work_packages.table_configuration.embedded_tab_disabled'),
-        };
-
-        this.externalRelationQuery.show({
-          currentQuery: JSON.parse(group.query),
-          callback: (queryProps:any) => (group.query = JSON.stringify(queryProps)),
-          disabledTabs,
-        });
-      },
-    );
-  }
-
-  deleteGroup(group:TypeGroup):void {
-    void this.typeBanner.conditional(
-      'edit_attribute_groups',
-      () => this.typeBanner.showEEOnlyHint(),
-      () => {
-        if (group.type === 'attribute') {
-          this.updateInactives(this.inactives.concat(group.attributes));
-        }
-
-        this.groups = this.groups.filter((el) => el !== group);
-
-        return group;
-      },
-    );
-  }
-
-  createGroup(type:TypeGroupType, groupName = ''):TypeGroup {
-    const group:TypeGroup = {
-      type,
-      name: groupName,
-      key: null,
-      query: this.no_filter_query,
-      attributes: [],
-    };
-
-    this.groups.unshift(group);
-    return group;
-  }
-
-  resetToDefault($event:Event):boolean {
-    this.confirmDialog
-      .confirm({
-        text: {
-          title: this.I18n.t('js.types.attribute_groups.reset_title'),
-          text: this.I18n.t('js.types.attribute_groups.confirm_reset'),
-          button_continue: this.I18n.t('js.label_reset'),
-        },
-      })
-      .then(() => {
-        const input = this.form.querySelector<HTMLInputElement>('input#type_attribute_groups')!;
-        input.value = JSON.stringify([]);
-
-        // Disable our form handler that updates the attribute groups
-        this.form.removeEventListener('submit', this.eventListeners.typeFormUpdater);
-        this.form.requestSubmit();
-      })
-      .catch(() => {
-      });
-
-    $event.preventDefault();
-    return false;
-  }
-
-  private updateInactives(newValue:TypeFormAttribute[]):void {
-    this.inactives = [...newValue].sort((a, b) => a.translation.localeCompare(b.translation));
-  }
-
-  // We maintain an empty group
-  // that gets hidden in the frontend in case the user
-  // decides to remove all groups
-  // This was necessary since the "default" is actually an empty array of groups
-  private get emptyGroup():TypeGroup {
-    return {
-      type: 'attribute', key: emptyTypeGroup, name: 'empty', attributes: [],
-    };
-  }
-
-  private updateHiddenFields():void {
-    const hiddenField = this.form.querySelector<HTMLInputElement>('.admin-type-form--hidden-field')!;
-    if (this.groups.length === 0) {
-      // Ensure we're adding an empty group if deliberately removing
-      // all values.
-      hiddenField.value = JSON.stringify([this.emptyGroup]);
-    } else {
-      hiddenField.value = JSON.stringify(this.groups);
-    }
-  }
-}
diff --git a/frontend/src/app/features/admin/types/type-form-configuration.html b/frontend/src/app/features/admin/types/type-form-configuration.html
deleted file mode 100644
index 824d39d8eb6..00000000000
--- a/frontend/src/app/features/admin/types/type-form-configuration.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<div class="toolbar-container -with-dropdown">
-  <div class="toolbar toolbar_empty-title">
-    <ul class="toolbar-items">
-      <li class="toolbar-item">
-        <button type="button -primary"
-          class="form-configuration--reset button"
-          (click)="resetToDefault($event)">
-          <op-icon icon-classes="button--icon icon-undo" />
-          <span class="button--text" [textContent]="text.reset"></span>
-        </button>
-      </li>
-      @if (typeBanner.eeAvailable) {
-        <li
-          class="toolbar-item drop-down">
-          <a class="form-configuration--add-group button -primary" aria-haspopup="true">
-            <op-icon icon-classes="button--icon icon-add" />
-            <span class="button--text" [textContent]="text.label_group"></span>
-            <op-icon icon-classes="button--dropdown-indicator" />
-          </a>
-          <ul class="menu-drop-down-container">
-            <li>
-              <button
-                type="button"
-                class="menu-item form-configuration--add-group"
-                [textContent]="text.add_group"
-                (click)="createGroup('attribute', '')"
-                >
-              </button>
-            </li>
-            <li>
-              <button
-                type="button"
-                class="menu-item form-configuration--add-group"
-                [textContent]="text.add_table"
-                (click)="addGroupAndOpenQuery()"
-                >
-              </button>
-            </li>
-          </ul>
-        </li>
-      }
-    </ul>
-  </div>
-</div>
-
-<div class="grid-block wrap">
-  <div class="grid-content small-12 medium-6">
-    <div id="draggable-groups" dragula="groups" [(dragulaModel)]="groups">
-      @for (group of groups; track group) {
-        @if (group.type === 'attribute') {
-          <op-type-form-attribute-group (removeAttribute)="deactivateAttribute($event)"
-            (deleteGroup)="deleteGroup(group)"
-            [group]="group" />
-        }
-        @if (group.type === 'query') {
-          <op-type-form-query-group (editQuery)="editQuery(group)"
-            (deleteGroup)="deleteGroup(group)"
-            [group]="group" />
-        }
-      }
-    </div>
-  </div>
-  <div class="grid-content small-12 medium-6">
-    <div id="type-form-conf-inactive-group">
-      <div class="group-head">
-        <span class="group-name" [textContent]="text.label_inactive"></span>
-        &ngsp;
-        <span class="advice" [textContent]="text.drag_to_activate"></span>
-      </div>
-      <div class="attributes" dragula="attributes" [(dragulaModel)]="inactives">
-        @for (inactive_attribute of inactives; track inactive_attribute) {
-          <div
-            class="type-form-conf-attribute"
-            [attr.data-key]="inactive_attribute.key">
-            <span class="attribute-handle icon-drag-handle"></span>
-            <span class="attribute-name">
-              {{ inactive_attribute.translation }}
-              @if (inactive_attribute.is_cf) {
-                <span
-                  class="attribute-cf-label"
-                  [textContent]="text.custom_field">
-                </span>
-              }
-            </span>
-          </div>
-        }
-      </div>
-    </div>
-  </div>
-</div><!-- END type form configurator -->
diff --git a/frontend/src/app/features/bim/bcf/api/bcf-api.service.ts b/frontend/src/app/features/bim/bcf/api/bcf-api.service.ts
index e2a4240ec59..0d07696892a 100644
--- a/frontend/src/app/features/bim/bcf/api/bcf-api.service.ts
+++ b/frontend/src/app/features/bim/bcf/api/bcf-api.service.ts
@@ -26,12 +26,14 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { BcfResourceCollectionPath } from 'core-app/features/bim/bcf/api/bcf-path-resources';
 import { BcfProjectPaths } from 'core-app/features/bim/bcf/api/projects/bcf-project.paths';
 
 @Injectable({ providedIn: 'root' })
 export class BcfApiService {
+  readonly injector = inject(Injector);
+
   public readonly bcfApiVersion = '2.1';
 
   public readonly appBasePath = window.appBasePath || '';
@@ -41,9 +43,6 @@ export class BcfApiService {
   // /api/bcf/:version/projects
   public readonly projects = new BcfResourceCollectionPath(this.injector, this.bcfApiBase, 'projects', BcfProjectPaths);
 
-  constructor(readonly injector:Injector) {
-  }
-
   /**
    * Parse the given string into a BCF resource path
    *
diff --git a/frontend/src/app/features/bim/bcf/api/bcf-authorization.service.ts b/frontend/src/app/features/bim/bcf/api/bcf-authorization.service.ts
index 9c61b30fbfa..aa35331f88b 100644
--- a/frontend/src/app/features/bim/bcf/api/bcf-authorization.service.ts
+++ b/frontend/src/app/features/bim/bcf/api/bcf-authorization.service.ts
@@ -6,18 +6,17 @@ import {
   Observable,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 
 export type AllowedExtensionKey = keyof BcfExtensionResource;
 
 @Injectable({ providedIn: 'root' })
 export class BcfAuthorizationService {
+  readonly bcfApi = inject(BcfApiService);
+
   // Poor mans caching to avoid repeatedly fetching from the backend.
   protected authorizationMap = multiInput<BcfExtensionResource>();
 
-  constructor(readonly bcfApi:BcfApiService) {
-  }
-
   /**
    * Returns an observable boolean whether the given action
    * is authorized in the project by using the project extensions.
diff --git a/frontend/src/app/features/bim/bcf/bcf-viewer-bridge/viewer-bridge.service.ts b/frontend/src/app/features/bim/bcf/bcf-viewer-bridge/viewer-bridge.service.ts
index 8bf75d3e58b..959341f3653 100644
--- a/frontend/src/app/features/bim/bcf/bcf-viewer-bridge/viewer-bridge.service.ts
+++ b/frontend/src/app/features/bim/bcf/bcf-viewer-bridge/viewer-bridge.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
@@ -7,6 +7,8 @@ import { CreateBcfViewpointData } from 'core-app/features/bim/bcf/api/bcf-api.mo
 
 @Injectable()
 export abstract class ViewerBridgeService {
+  readonly injector = inject(Injector);
+
   @InjectField() state:StateService;
 
   /**
@@ -14,8 +16,6 @@ export abstract class ViewerBridgeService {
    */
   abstract shouldShowViewer:boolean;
 
-  protected constructor(readonly injector:Injector) {}
-
   /**
    * Get a viewpoint from the viewer
    */
diff --git a/frontend/src/app/features/bim/bcf/bcf-wp-attribute-group/bcf-wp-attribute-group.component.ts b/frontend/src/app/features/bim/bcf/bcf-wp-attribute-group/bcf-wp-attribute-group.component.ts
index 063c98c7dbd..96f0a1bec56 100644
--- a/frontend/src/app/features/bim/bcf/bcf-wp-attribute-group/bcf-wp-attribute-group.component.ts
+++ b/frontend/src/app/features/bim/bcf/bcf-wp-attribute-group/bcf-wp-attribute-group.component.ts
@@ -26,17 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-  OnDestroy,
-  OnInit,
-  Optional,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { NgxGalleryComponent, NgxGalleryOptions } from '@kolkov/ngx-gallery';
@@ -62,6 +52,17 @@ import { filter, take } from 'rxjs/operators';
   standalone: false,
 })
 export class BcfWpAttributeGroupComponent extends UntilDestroyedMixin implements AfterViewInit, OnDestroy, OnInit {
+  readonly state = inject(StateService);
+  readonly bcfAuthorization = inject(BcfAuthorizationService);
+  readonly viewerBridge = inject(ViewerBridgeService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly wpCreate = inject(WorkPackageCreateService);
+  readonly toastService = inject(ToastService);
+  readonly bcfViewer = inject(BcfViewService, { optional: true });
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly I18n = inject(I18nService);
+  readonly viewpointsService = inject(ViewpointsService);
+
   @Input() workPackage:WorkPackageResource;
 
   @ViewChild(NgxGalleryComponent) gallery:NgxGalleryComponent;
@@ -146,19 +147,6 @@ export class BcfWpAttributeGroupComponent extends UntilDestroyedMixin implements
 
   projectId:string;
 
-  constructor(readonly state:StateService,
-    readonly bcfAuthorization:BcfAuthorizationService,
-    readonly viewerBridge:ViewerBridgeService,
-    readonly apiV3Service:ApiV3Service,
-    readonly wpCreate:WorkPackageCreateService,
-    readonly toastService:ToastService,
-    @Optional() readonly bcfViewer:BcfViewService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-    readonly viewpointsService:ViewpointsService) {
-    super();
-  }
-
   ngAfterViewInit():void {
     // Observe changes on the work package to update the viewpoints
     this.observeChanges();
diff --git a/frontend/src/app/features/bim/bcf/helper/bcf-detector.service.ts b/frontend/src/app/features/bim/bcf/helper/bcf-detector.service.ts
index 145649f21db..5132a8a122d 100644
--- a/frontend/src/app/features/bim/bcf/helper/bcf-detector.service.ts
+++ b/frontend/src/app/features/bim/bcf/helper/bcf-detector.service.ts
@@ -1,9 +1,9 @@
-import { Inject, Injectable, DOCUMENT } from '@angular/core';
+import { Injectable, DOCUMENT, inject } from '@angular/core';
 
 @Injectable()
 export class BcfDetectorService {
-  constructor(@Inject(DOCUMENT) private documentElement:Document) {
-  }
+  private documentElement = inject<Document>(DOCUMENT);
+
 
   /**
    * Detect whether the BCF module was activated,
diff --git a/frontend/src/app/features/bim/bcf/helper/bcf-path-helper.service.ts b/frontend/src/app/features/bim/bcf/helper/bcf-path-helper.service.ts
index dbfb644e2cc..48df8499008 100644
--- a/frontend/src/app/features/bim/bcf/helper/bcf-path-helper.service.ts
+++ b/frontend/src/app/features/bim/bcf/helper/bcf-path-helper.service.ts
@@ -26,14 +26,14 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { HalLink } from 'core-app/features/hal/hal-link/hal-link';
 
 @Injectable()
 export class BcfPathHelperService {
-  constructor(readonly pathHelper:PathHelperService) {
-  }
+  readonly pathHelper = inject(PathHelperService);
+
 
   public projectImportIssuePath(projectIdentifier:string) {
     return `${this.pathHelper.projectPath(projectIdentifier)}/issues/upload`;
diff --git a/frontend/src/app/features/bim/bcf/helper/viewpoints.service.ts b/frontend/src/app/features/bim/bcf/helper/viewpoints.service.ts
index 1abc9b947ff..0710f819261 100644
--- a/frontend/src/app/features/bim/bcf/helper/viewpoints.service.ts
+++ b/frontend/src/app/features/bim/bcf/helper/viewpoints.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import { BcfApiService } from 'core-app/features/bim/bcf/api/bcf-api.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
@@ -42,6 +42,8 @@ import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 
 @Injectable()
 export class ViewpointsService {
+  readonly injector = inject(Injector);
+
   topicUUID:string|number|null = null;
 
   @InjectField() bcfApi:BcfApiService;
@@ -50,8 +52,6 @@ export class ViewpointsService {
 
   @InjectField() apiV3Service:ApiV3Service;
 
-  constructor(readonly injector:Injector) { }
-
   public getViewPointResource(workPackage:WorkPackageResource, index:number):BcfViewpointPaths {
     const viewpointHref = (workPackage.bcfViewpoints as HalResource[])[index].href!;
 
diff --git a/app/components/open_project/common/work_package_card_list_component/header.sass b/frontend/src/app/features/bim/bcf/openproject-bcf.module.spec.ts
similarity index 69%
rename from app/components/open_project/common/work_package_card_list_component/header.sass
rename to frontend/src/app/features/bim/bcf/openproject-bcf.module.spec.ts
index 0e618e18a1a..03da3a55714 100644
--- a/app/components/open_project/common/work_package_card_list_component/header.sass
+++ b/frontend/src/app/features/bim/bcf/openproject-bcf.module.spec.ts
@@ -26,15 +26,15 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-.op-work-package-card-list-header
-  display: grid
-  grid-template-columns: 1fr minmax(5rem, max-content) auto
-  grid-template-areas: "collapsible actions menu"
-  align-items: center
+import { Injector } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { IFCViewerService } from 'core-app/features/bim/ifc_models/ifc-viewer/ifc-viewer.service';
+import { viewerBridgeServiceFactory } from 'core-app/features/bim/bcf/openproject-bcf.module';
 
-  &--actions,
-  &--menu
-    margin-left: var(--stack-gap-normal)
-    align-self: flex-start
-    // Unfortunately, the invisible button style bites us here again.
-    margin-top: -6px
+describe('viewerBridgeServiceFactory', () => {
+  it('falls back to an IFC viewer service when none is registered', () => {
+    const injector = TestBed.inject(Injector);
+
+    expect(viewerBridgeServiceFactory(injector)).toBeInstanceOf(IFCViewerService);
+  });
+});
diff --git a/frontend/src/app/features/bim/bcf/openproject-bcf.module.ts b/frontend/src/app/features/bim/bcf/openproject-bcf.module.ts
index 970eff0859e..a9b06546912 100644
--- a/frontend/src/app/features/bim/bcf/openproject-bcf.module.ts
+++ b/frontend/src/app/features/bim/bcf/openproject-bcf.module.ts
@@ -29,6 +29,8 @@
 import {
   Injector,
   NgModule,
+  inject,
+  runInInjectionContext,
 } from '@angular/core';
 import { OpSharedModule } from 'core-app/shared/shared.module';
 import { NgxGalleryModule } from '@kolkov/ngx-gallery';
@@ -57,9 +59,12 @@ import { RefreshButtonComponent } from 'core-app/features/bim/ifc_models/toolbar
  */
 export const viewerBridgeServiceFactory = (injector:Injector) => {
   if (window.navigator.userAgent.search('Revit') > -1) {
-    return new RevitBridgeService(injector);
+    return runInInjectionContext(injector, () => new RevitBridgeService());
   }
-  return injector.get(IFCViewerService, new IFCViewerService(injector));
+
+  const ifcViewerService = injector.get(IFCViewerService, null);
+
+  return ifcViewerService ?? runInInjectionContext(injector, () => new IFCViewerService());
 };
 
 @NgModule({
@@ -93,7 +98,9 @@ export const viewerBridgeServiceFactory = (injector:Injector) => {
 export class OpenprojectBcfModule {
   static bootstrapCalled = false;
 
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     OpenprojectBcfModule.bootstrap(injector);
   }
 
diff --git a/frontend/src/app/features/bim/ifc_models/bcf/split/left/bcf-split-left.component.ts b/frontend/src/app/features/bim/ifc_models/bcf/split/left/bcf-split-left.component.ts
index 1e4323d9d6b..b7d7090cb83 100644
--- a/frontend/src/app/features/bim/ifc_models/bcf/split/left/bcf-split-left.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/bcf/split/left/bcf-split-left.component.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { BcfViewService } from 'core-app/features/bim/ifc_models/pages/viewer/bcf-view.service';
@@ -42,9 +38,9 @@ import { BcfViewService } from 'core-app/features/bim/ifc_models/pages/viewer/bc
   standalone: false,
 })
 export class BcfSplitLeftComponent implements OnInit {
-  showViewer$:Observable<boolean>;
+  private readonly bcfView = inject(BcfViewService);
 
-  constructor(private readonly bcfView:BcfViewService) {}
+  showViewer$:Observable<boolean>;
 
   ngOnInit():void {
     this.showViewer$ = this.bcfView.live$()
diff --git a/frontend/src/app/features/bim/ifc_models/bcf/split/right/bcf-split-right.component.ts b/frontend/src/app/features/bim/ifc_models/bcf/split/right/bcf-split-right.component.ts
index 9efdbacf640..3e589d9ca3f 100644
--- a/frontend/src/app/features/bim/ifc_models/bcf/split/right/bcf-split-right.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/bcf/split/right/bcf-split-right.component.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { BcfViewService } from 'core-app/features/bim/ifc_models/pages/viewer/bcf-view.service';
 import { map } from 'rxjs/operators';
@@ -42,9 +38,9 @@ import { map } from 'rxjs/operators';
   standalone: false,
 })
 export class BcfSplitRightComponent implements OnInit {
-  showWorkPackages$:Observable<boolean>;
+  private readonly bcfView = inject(BcfViewService);
 
-  constructor(private readonly bcfView:BcfViewService) {}
+  showWorkPackages$:Observable<boolean>;
 
   ngOnInit():void {
     this.showWorkPackages$ = this.bcfView.live$()
diff --git a/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts b/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts
index 30ec7a409f1..a09018887e1 100644
--- a/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  HostListener,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { IFCViewerService } from 'core-app/features/bim/ifc_models/ifc-viewer/ifc-viewer.service';
 import { IfcModelsDataService } from 'core-app/features/bim/ifc_models/pages/viewer/ifc-models-data.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -56,6 +47,12 @@ import { filter, take } from 'rxjs/operators';
   standalone: false,
 })
 export class IFCViewerComponent implements OnInit, OnDestroy, AfterViewInit {
+  ifcData = inject(IfcModelsDataService);
+  private I18n = inject(I18nService);
+  private ifcViewerService = inject(IFCViewerService);
+  private currentUserService = inject(CurrentUserService);
+  private currentProjectService = inject(CurrentProjectService);
+
   private viewInitialized$ = new Subject<void>();
 
   modelCount:number = this.ifcData.models.length;
@@ -86,14 +83,6 @@ export class IFCViewerComponent implements OnInit, OnDestroy, AfterViewInit {
 
   @ViewChild('xeokitToolbarIcons') xeokitToolbarIcons:ElementRef;
 
-  constructor(
-    public ifcData:IfcModelsDataService,
-    private I18n:I18nService,
-    private ifcViewerService:IFCViewerService,
-    private currentUserService:CurrentUserService,
-    private currentProjectService:CurrentProjectService,
-  ) { }
-
   ngOnInit():void {
     if (this.modelCount === 0) {
       return;
diff --git a/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.service.ts b/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.service.ts
index e7823f88ccc..cc5fb8360ca 100644
--- a/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.service.ts
+++ b/frontend/src/app/features/bim/ifc_models/ifc-viewer/ifc-viewer.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { XeokitServer } from 'core-app/features/bim/ifc_models/xeokit/xeokit-server';
 import { ViewerBridgeService } from 'core-app/features/bim/bcf/bcf-viewer-bridge/viewer-bridge.service';
 import { BehaviorSubject, Observable, of } from 'rxjs';
@@ -123,10 +123,6 @@ export class IFCViewerService extends ViewerBridgeService {
 
   @InjectField() httpClient:HttpClient;
 
-  constructor(readonly injector:Injector) {
-    super(injector);
-  }
-
   public newViewer(elements:XeokitElements, projects:IfcProjectDefinition[]):void {
     const server = new XeokitServer(this.pathHelper, this.ifcModelsDataService);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
diff --git a/frontend/src/app/features/bim/ifc_models/pages/viewer/bcf-view.service.ts b/frontend/src/app/features/bim/ifc_models/pages/viewer/bcf-view.service.ts
index 296358ff443..119c1f63b64 100644
--- a/frontend/src/app/features/bim/ifc_models/pages/viewer/bcf-view.service.ts
+++ b/frontend/src/app/features/bim/ifc_models/pages/viewer/bcf-view.service.ts
@@ -26,10 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageQueryStateService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-base.service';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { ViewerBridgeService } from 'core-app/features/bim/bcf/bcf-viewer-bridge/viewer-bridge.service';
 
@@ -43,6 +42,9 @@ export type BcfViewState = 'cards'|'viewer'|'splitTable'|'splitCards'|'table';
 
 @Injectable()
 export class BcfViewService extends WorkPackageQueryStateService<BcfViewState> {
+  private readonly I18n = inject(I18nService);
+  private readonly viewerBridgeService = inject(ViewerBridgeService);
+
   public text:Record<string, string> = {
     cards: this.I18n.t('js.views.card'),
     viewer: this.I18n.t('js.ifc_models.views.viewer'),
@@ -59,14 +61,6 @@ export class BcfViewService extends WorkPackageQueryStateService<BcfViewState> {
     table: 'icon-view-list',
   };
 
-  constructor(
-    private readonly I18n:I18nService,
-    private readonly viewerBridgeService:ViewerBridgeService,
-    protected readonly querySpace:IsolatedQuerySpace,
-  ) {
-    super(querySpace);
-  }
-
   hasChanged(query:QueryResource):boolean {
     return this.current !== query.displayRepresentation;
   }
diff --git a/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts b/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts
index 1353dca3c8e..d0ad8893cdb 100644
--- a/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Injector, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, OnDestroy, ViewEncapsulation, inject } from '@angular/core';
 
 import {
   PartitionedQuerySpacePageComponent,
@@ -94,6 +94,10 @@ import {
 export class IFCViewerPageComponent
   extends PartitionedQuerySpacePageComponent
   implements UntilDestroyedMixin, OnInit, OnDestroy {
+  readonly ifcData = inject(IfcModelsDataService);
+  readonly bcfView = inject(BcfViewService);
+  readonly viewerBridgeService = inject(ViewerBridgeService);
+
   text = {
     title: this.I18n.t('js.bcf.management'),
     delete: this.I18n.t('js.button_delete'),
@@ -157,15 +161,6 @@ export class IFCViewerPageComponent
   // eslint-disable-next-line @typescript-eslint/ban-types
   private removeSubscription:Function;
 
-  constructor(
-    readonly ifcData:IfcModelsDataService,
-    readonly bcfView:BcfViewService,
-    readonly injector:Injector,
-    readonly viewerBridgeService:ViewerBridgeService,
-  ) {
-    super(injector);
-  }
-
   ngOnInit():void {
     super.ngOnInit();
 
diff --git a/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-export-button.component.ts b/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-export-button.component.ts
index 1bbb9f85189..192ceef3c21 100644
--- a/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-export-button.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-export-button.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnDestroy, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnDestroy, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { BcfPathHelperService } from 'core-app/features/bim/bcf/helper/bcf-path-helper.service';
@@ -59,6 +57,18 @@ import { JobStatusModalService } from 'core-app/features/job-status/job-status-m
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BcfExportButtonComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly bcfPathHelper = inject(BcfPathHelperService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly queryUrlParamsHelper = inject(UrlParamsHelperService);
+  readonly jobStatusModalService = inject(JobStatusModalService);
+  readonly httpClient = inject(HttpClient);
+  readonly injector = inject(Injector);
+  readonly toastService = inject(ToastService);
+  readonly state = inject(StateService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   public text = {
     export: this.I18n.t('js.bcf.export'),
     export_hover: this.I18n.t('js.bcf.export_bcf_xml_file'),
@@ -68,20 +78,6 @@ export class BcfExportButtonComponent extends UntilDestroyedMixin implements OnI
 
   public exportLink:string;
 
-  constructor(readonly I18n:I18nService,
-    readonly currentProject:CurrentProjectService,
-    readonly bcfPathHelper:BcfPathHelperService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly queryUrlParamsHelper:UrlParamsHelperService,
-    readonly jobStatusModalService:JobStatusModalService,
-    readonly httpClient:HttpClient,
-    readonly injector:Injector,
-    readonly toastService:ToastService,
-    readonly state:StateService,
-    readonly cdRef:ChangeDetectorRef) {
-    super();
-  }
-
   ngOnInit() {
     this.querySpace.query
       .values$()
diff --git a/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-import-button.component.ts b/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-import-button.component.ts
index b320357f6ba..fcc7f775053 100644
--- a/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-import-button.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/bcf-import-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { BcfPathHelperService } from 'core-app/features/bim/bcf/helper/bcf-path-helper.service';
@@ -48,16 +48,15 @@ import { BcfPathHelperService } from 'core-app/features/bim/bcf/helper/bcf-path-
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BcfImportButtonComponent {
+  readonly I18n = inject(I18nService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly bcfPathHelper = inject(BcfPathHelperService);
+
   public text = {
     import: this.I18n.t('js.bcf.import'),
     import_hover: this.I18n.t('js.bcf.import_bcf_xml_file'),
   };
 
-  constructor(readonly I18n:I18nService,
-    readonly currentProject:CurrentProjectService,
-    readonly bcfPathHelper:BcfPathHelperService) {
-  }
-
   public handleClick() {
     const projectIdentifier = this.currentProject.identifier;
     if (projectIdentifier) {
diff --git a/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/refresh-button.component.ts b/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/refresh-button.component.ts
index daee1e4ca5b..668d5baaae7 100644
--- a/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/refresh-button.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/toolbar/import-export-bcf/refresh-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { StateService } from '@uirouter/core';
 
@@ -43,15 +43,14 @@ import { StateService } from '@uirouter/core';
   standalone: false,
 })
 export class RefreshButtonComponent {
+  readonly I18n = inject(I18nService);
+  readonly state = inject(StateService);
+
   public text = {
     refresh: this.I18n.t('js.bcf.refresh'),
     refresh_hover: this.I18n.t('js.bcf.refresh_work_package'),
   };
 
-  constructor(readonly I18n:I18nService,
-    readonly state:StateService) {
-  }
-
   refresh() {
     void this.state.go('.', {}, { reload: true });
   }
diff --git a/frontend/src/app/features/bim/ifc_models/toolbar/manage-ifc-models-button/bim-manage-ifc-models-button.component.ts b/frontend/src/app/features/bim/ifc_models/toolbar/manage-ifc-models-button/bim-manage-ifc-models-button.component.ts
index e030998bc45..dbd75aed06c 100644
--- a/frontend/src/app/features/bim/ifc_models/toolbar/manage-ifc-models-button/bim-manage-ifc-models-button.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/toolbar/manage-ifc-models-button/bim-manage-ifc-models-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IfcModelsDataService } from 'core-app/features/bim/ifc_models/pages/viewer/ifc-models-data.service';
 
@@ -49,6 +49,9 @@ import { IfcModelsDataService } from 'core-app/features/bim/ifc_models/pages/vie
   standalone: false,
 })
 export class BimManageIfcModelsButtonComponent {
+  readonly I18n = inject(I18nService);
+  readonly ifcData = inject(IfcModelsDataService);
+
   text = {
     manage: this.I18n.t('js.ifc_models.models.ifc_models'),
   };
@@ -56,8 +59,4 @@ export class BimManageIfcModelsButtonComponent {
   manageAllowed = this.ifcData.allowed('manage_ifc_models');
 
   manageIFCPath = this.ifcData.manageIFCPath;
-
-  constructor(readonly I18n:I18nService,
-    readonly ifcData:IfcModelsDataService) {
-  }
 }
diff --git a/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-button.component.ts b/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-button.component.ts
index 30dc8d31100..511675ecaf2 100644
--- a/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-button.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { BcfViewService } from 'core-app/features/bim/ifc_models/pages/viewer/bcf-view.service';
 
@@ -50,7 +50,8 @@ import { BcfViewService } from 'core-app/features/bim/ifc_models/pages/viewer/bc
   standalone: false,
 })
 export class BcfViewToggleButtonComponent {
-  view$ = this.bcfView.live$();
+  readonly I18n = inject(I18nService);
+  readonly bcfView = inject(BcfViewService);
 
-  constructor(readonly I18n:I18nService, readonly bcfView:BcfViewService) { }
+  view$ = this.bcfView.live$();
 }
diff --git a/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-dropdown.directive.ts b/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-dropdown.directive.ts
index 3778371b688..c67ea712bdd 100644
--- a/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-dropdown.directive.ts
+++ b/frontend/src/app/features/bim/ifc_models/toolbar/view-toggle/bcf-view-toggle-dropdown.directive.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef } from '@angular/core';
+import { Directive, inject } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { StateService } from '@uirouter/core';
@@ -48,15 +47,11 @@ import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op
   standalone: false,
 })
 export class BcfViewToggleDropdownDirective extends OpContextMenuTrigger {
-  constructor(readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly bcfView:BcfViewService,
-    readonly I18n:I18nService,
-    readonly state:StateService,
-    readonly wpFiltersService:WorkPackageFiltersService,
-    readonly viewerBridgeService:ViewerBridgeService) {
-    super(elementRef, opContextMenu);
-  }
+  readonly bcfView = inject(BcfViewService);
+  readonly I18n = inject(I18nService);
+  readonly state = inject(StateService);
+  readonly wpFiltersService = inject(WorkPackageFiltersService);
+  readonly viewerBridgeService = inject(ViewerBridgeService);
 
   protected open(evt:Event):void {
     this.buildItems();
diff --git a/frontend/src/app/features/bim/revit_add_in/revit-add-in-settings-button.service.ts b/frontend/src/app/features/bim/revit_add_in/revit-add-in-settings-button.service.ts
index 82622e630fc..1c4ca9dc4f1 100644
--- a/frontend/src/app/features/bim/revit_add_in/revit-add-in-settings-button.service.ts
+++ b/frontend/src/app/features/bim/revit_add_in/revit-add-in-settings-button.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -36,13 +36,15 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
  */
 @Injectable()
 export class RevitAddInSettingsButtonService {
+  private readonly i18n = inject(I18nService);
+
   private readonly labelText:string;
 
   private readonly groupLabelText:string;
 
-  constructor(
-    private readonly i18n:I18nService,
-  ) {
+  constructor() {
+    const i18n = this.i18n;
+
     const onRevitAddInEnvironment = window.navigator.userAgent.search('Revit') > -1;
 
     if (onRevitAddInEnvironment) {
diff --git a/frontend/src/app/features/bim/revit_add_in/revit-bridge.service.ts b/frontend/src/app/features/bim/revit_add_in/revit-bridge.service.ts
index 554797b49d8..0af2f06a801 100644
--- a/frontend/src/app/features/bim/revit_add_in/revit-bridge.service.ts
+++ b/frontend/src/app/features/bim/revit_add_in/revit-bridge.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import {
   distinctUntilChanged, filter, first, map,
@@ -66,8 +66,8 @@ export class RevitBridgeService extends ViewerBridgeService {
 
   revitMessageReceived$ = this.revitMessageReceivedSource.asObservable();
 
-  constructor(readonly injector:Injector) {
-    super(injector);
+  constructor() {
+    super();
 
     if (window.RevitBridge) {
       this.hookUpRevitListener();
diff --git a/frontend/src/app/features/boards/board/add-card-dropdown/add-card-dropdown-menu.directive.ts b/frontend/src/app/features/boards/board/add-card-dropdown/add-card-dropdown-menu.directive.ts
index 7ca7cdeac5c..db05068e686 100644
--- a/frontend/src/app/features/boards/board/add-card-dropdown/add-card-dropdown-menu.directive.ts
+++ b/frontend/src/app/features/boards/board/add-card-dropdown/add-card-dropdown-menu.directive.ts
@@ -26,13 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectorRef, Directive, ElementRef, Injector,
-} from '@angular/core';
+import { ChangeDetectorRef, Directive, Injector, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { WorkPackageInlineCreateService } from 'core-app/features/work-packages/components/wp-inline-create/wp-inline-create.service';
@@ -43,18 +40,14 @@ import { BoardListComponent } from 'core-app/features/boards/board/board-list/bo
   standalone: false,
 })
 export class AddCardDropdownMenuDirective extends OpContextMenuTrigger {
-  constructor(readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly opModalService:OpModalService,
-    readonly authorisationService:AuthorisationService,
-    readonly wpInlineCreate:WorkPackageInlineCreateService,
-    readonly boardList:BoardListComponent,
-    readonly injector:Injector,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService) {
-    super(elementRef, opContextMenu);
-  }
+  readonly opModalService = inject(OpModalService);
+  readonly authorisationService = inject(AuthorisationService);
+  readonly wpInlineCreate = inject(WorkPackageInlineCreateService);
+  readonly boardList = inject(BoardListComponent);
+  readonly injector = inject(Injector);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly I18n = inject(I18nService);
 
   protected open(evt:Event) {
     this.items = this.buildItems();
diff --git a/frontend/src/app/features/boards/board/add-list-modal/add-list-modal.component.ts b/frontend/src/app/features/boards/board/add-list-modal/add-list-modal.component.ts
index 5c477b04f12..96d9a9d900c 100644
--- a/frontend/src/app/features/boards/board/add-list-modal/add-list-modal.component.ts
+++ b/frontend/src/app/features/boards/board/add-list-modal/add-list-modal.component.ts
@@ -26,12 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, OnInit, ViewChild,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ChangeDetectionStrategy, Component, OnInit, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { Board } from 'core-app/features/boards/board/board';
 import { BoardService } from 'core-app/features/boards/board/board.service';
@@ -58,6 +54,14 @@ import { HalResource } from 'core-app/features/hal/resources/hal-resource';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class AddListModalComponent extends OpModalComponent implements OnInit {
+  readonly boardActions = inject(BoardActionsRegistryService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly boardService = inject(BoardService);
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly pathHelper = inject(PathHelperService);
+
   @ViewChild(OpAutocompleterComponent, { static: true }) public ngSelectComponent:OpAutocompleterComponent;
 
   getAutocompleterData = (searchTerm:string):Observable<HalResource[]> => {
@@ -112,19 +116,6 @@ export class AddListModalComponent extends OpModalComponent implements OnInit {
   /** Whether the no results warning is displayed */
   showWarning = false;
 
-  constructor(readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly boardActions:BoardActionsRegistryService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly boardService:BoardService,
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly currentProject:CurrentProjectService,
-    readonly pathHelper:PathHelperService) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit() {
     super.ngOnInit();
     this.board = this.locals.board;
diff --git a/frontend/src/app/features/boards/board/board-actions/assignee/assignee-board-header.component.ts b/frontend/src/app/features/boards/board/board-actions/assignee/assignee-board-header.component.ts
index 7321bcf61b4..710fa05af14 100644
--- a/frontend/src/app/features/boards/board/board-actions/assignee/assignee-board-header.component.ts
+++ b/frontend/src/app/features/boards/board/board-actions/assignee/assignee-board-header.component.ts
@@ -25,7 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { UserResource } from 'core-app/features/hal/resources/user-resource';
@@ -41,13 +41,12 @@ import { UserResource } from 'core-app/features/hal/resources/user-resource';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class AssigneeBoardHeaderComponent {
+  readonly pathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input('resource') public user:UserResource;
 
   text = {
     assignee: this.I18n.t('js.work_packages.properties.assignee'),
   };
-
-  constructor(readonly pathHelper:PathHelperService,
-    readonly I18n:I18nService) {
-  }
 }
diff --git a/frontend/src/app/features/boards/board/board-actions/board-action.service.ts b/frontend/src/app/features/boards/board/board-actions/board-action.service.ts
index ef1e4f0e361..1d285a6db2d 100644
--- a/frontend/src/app/features/boards/board/board-actions/board-action.service.ts
+++ b/frontend/src/app/features/boards/board/board-actions/board-action.service.ts
@@ -7,7 +7,7 @@ import { BoardListsService } from 'core-app/features/boards/board/board-list/boa
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { map } from 'rxjs/operators';
 import { IFieldSchema } from 'core-app/shared/components/fields/field.base';
 import { WorkPackageChangeset } from 'core-app/features/work-packages/components/wp-edit/work-package-changeset';
@@ -25,15 +25,15 @@ import idFromLink from 'core-app/features/hal/helpers/id-from-link';
 
 @Injectable()
 export abstract class BoardActionService {
-  constructor(readonly injector:Injector,
-    protected boardListsService:BoardListsService,
-    protected I18n:I18nService,
-    protected halResourceService:HalResourceService,
-    protected pathHelper:PathHelperService,
-    protected currentProject:CurrentProjectService,
-    protected apiV3Service:ApiV3Service,
-    protected schemaCache:SchemaCacheService) {
-  }
+  readonly injector = inject(Injector);
+  protected boardListsService = inject(BoardListsService);
+  protected I18n = inject(I18nService);
+  protected halResourceService = inject(HalResourceService);
+  protected pathHelper = inject(PathHelperService);
+  protected currentProject = inject(CurrentProjectService);
+  protected apiV3Service = inject(ApiV3Service);
+  protected schemaCache = inject(SchemaCacheService);
+
 
   /**
    * Get the attribute name
diff --git a/frontend/src/app/features/boards/board/board-actions/status/status-board-header.component.ts b/frontend/src/app/features/boards/board/board-actions/status/status-board-header.component.ts
index cfdab8c28fc..ff98979b178 100644
--- a/frontend/src/app/features/boards/board/board-actions/status/status-board-header.component.ts
+++ b/frontend/src/app/features/boards/board/board-actions/status/status-board-header.component.ts
@@ -25,7 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { StatusResource } from 'core-app/features/hal/resources/status-resource';
 
@@ -40,12 +40,11 @@ import { StatusResource } from 'core-app/features/hal/resources/status-resource'
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class StatusBoardHeaderComponent {
+  readonly I18n = inject(I18nService);
+
   @Input('resource') public status:StatusResource;
 
   text = {
     status: this.I18n.t('js.work_packages.properties.status'),
   };
-
-  constructor(readonly I18n:I18nService) {
-  }
 }
diff --git a/frontend/src/app/features/boards/board/board-actions/subproject/subproject-board-header.component.ts b/frontend/src/app/features/boards/board/board-actions/subproject/subproject-board-header.component.ts
index 27fe9a979fc..3ca13c191ae 100644
--- a/frontend/src/app/features/boards/board/board-actions/subproject/subproject-board-header.component.ts
+++ b/frontend/src/app/features/boards/board/board-actions/subproject/subproject-board-header.component.ts
@@ -25,7 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
@@ -42,6 +42,9 @@ import idFromLink from 'core-app/features/hal/helpers/id-from-link';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class SubprojectBoardHeaderComponent {
+  readonly pathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() public resource:HalResource;
 
   idFromLink = idFromLink;
@@ -49,8 +52,4 @@ export class SubprojectBoardHeaderComponent {
   text = {
     project: this.I18n.t('js.label_project'),
   };
-
-  constructor(readonly pathHelper:PathHelperService,
-    readonly I18n:I18nService) {
-  }
 }
diff --git a/frontend/src/app/features/boards/board/board-actions/subtasks/subtasks-board-header.component.ts b/frontend/src/app/features/boards/board/board-actions/subtasks/subtasks-board-header.component.ts
index 04040a17623..52253bd4414 100644
--- a/frontend/src/app/features/boards/board/board-actions/subtasks/subtasks-board-header.component.ts
+++ b/frontend/src/app/features/boards/board/board-actions/subtasks/subtasks-board-header.component.ts
@@ -25,7 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
@@ -43,6 +43,9 @@ import idFromLink from 'core-app/features/hal/helpers/id-from-link';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class SubtasksBoardHeaderComponent implements OnInit {
+  readonly pathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() public resource:WorkPackageResource;
 
   idFromLink = idFromLink;
@@ -53,10 +56,6 @@ export class SubtasksBoardHeaderComponent implements OnInit {
 
   typeHighlightingClass:string;
 
-  constructor(readonly pathHelper:PathHelperService,
-    readonly I18n:I18nService) {
-  }
-
   ngOnInit() {
     this.typeHighlightingClass = Highlighting.inlineClass('type', this.resource.type.id!);
   }
diff --git a/frontend/src/app/features/boards/board/board-actions/version/version-board-header.component.ts b/frontend/src/app/features/boards/board/board-actions/version/version-board-header.component.ts
index d57d88bc732..5c1a79bf5a0 100644
--- a/frontend/src/app/features/boards/board/board-actions/version/version-board-header.component.ts
+++ b/frontend/src/app/features/boards/board/board-actions/version/version-board-header.component.ts
@@ -25,7 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { VersionResource } from 'core-app/features/hal/resources/version-resource';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -41,11 +41,11 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class VersionBoardHeaderComponent {
-  @Input('resource') public version:VersionResource;
+  readonly I18n = inject(I18nService);
+  readonly pathHelper = inject(PathHelperService);
 
-  constructor(readonly I18n:I18nService,
-    readonly pathHelper:PathHelperService) {
-  }
+  // eslint-disable-next-line @angular-eslint/no-input-rename
+  @Input('resource') public version:VersionResource;
 
   public text = {
     isLocked: this.I18n.t('js.boards.version.is_locked'),
diff --git a/frontend/src/app/features/boards/board/board-filter/board-filter.component.ts b/frontend/src/app/features/boards/board/board-filter/board-filter.component.ts
index 0a3ec34be8f..1bae1325dfb 100644
--- a/frontend/src/app/features/boards/board/board-filter/board-filter.component.ts
+++ b/frontend/src/app/features/boards/board/board-filter/board-filter.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { Board } from 'core-app/features/boards/board/board';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { WorkPackageStatesInitializationService } from 'core-app/features/work-packages/components/wp-list/wp-states-initialization.service';
@@ -23,22 +23,20 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BoardFilterComponent extends UntilDestroyedMixin implements AfterViewInit {
+  private readonly currentProjectService = inject(CurrentProjectService);
+  private readonly querySpace = inject(IsolatedQuerySpace);
+  private readonly apiV3Service = inject(ApiV3Service);
+  private readonly halResourceService = inject(HalResourceService);
+  private readonly wpStatesInitialization = inject(WorkPackageStatesInitializationService);
+  private readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  private readonly urlParamsHelper = inject(UrlParamsHelperService);
+  private readonly boardFilters = inject(BoardFiltersService);
+
   /** Current active */
   @Input() public board$:Observable<Board>;
 
   initialized = false;
 
-  constructor(private readonly currentProjectService:CurrentProjectService,
-    private readonly querySpace:IsolatedQuerySpace,
-    private readonly apiV3Service:ApiV3Service,
-    private readonly halResourceService:HalResourceService,
-    private readonly wpStatesInitialization:WorkPackageStatesInitializationService,
-    private readonly wpTableFilters:WorkPackageViewFiltersService,
-    private readonly urlParamsHelper:UrlParamsHelperService,
-    private readonly boardFilters:BoardFiltersService) {
-    super();
-  }
-
   ngAfterViewInit():void {
     if (!this.board$) {
       return;
diff --git a/frontend/src/app/features/boards/board/board-list/board-inline-create.service.ts b/frontend/src/app/features/boards/board/board-list/board-inline-create.service.ts
index cd2d0d53ffe..410ff8ebefa 100644
--- a/frontend/src/app/features/boards/board/board-list/board-inline-create.service.ts
+++ b/frontend/src/app/features/boards/board/board-list/board-inline-create.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import {
   WorkPackageInlineCreateService,
@@ -40,13 +40,8 @@ import { Observable } from 'rxjs';
 
 @Injectable()
 export class BoardInlineCreateService extends WorkPackageInlineCreateService {
-  constructor(
-    readonly injector:Injector,
-    protected readonly querySpace:IsolatedQuerySpace,
-    protected readonly halResourceService:HalResourceService,
-  ) {
-    super(injector);
-  }
+  protected readonly querySpace = inject(IsolatedQuerySpace);
+  protected readonly halResourceService = inject(HalResourceService);
 
   /**
    * A separate reference pane for the inline create component
diff --git a/frontend/src/app/features/boards/board/board-list/board-list-menu.component.ts b/frontend/src/app/features/boards/board/board-list/board-list-menu.component.ts
index 6c1ee33907b..cb83ba894c2 100644
--- a/frontend/src/app/features/boards/board/board-list/board-list-menu.component.ts
+++ b/frontend/src/app/features/boards/board/board-list/board-list-menu.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, Component, EventEmitter, Input, Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
@@ -49,18 +47,17 @@ import { BoardActionService } from 'core-app/features/boards/board/board-actions
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BoardListMenuComponent {
+  readonly opModalService = inject(OpModalService);
+  readonly authorisationService = inject(AuthorisationService);
+  private readonly querySpace = inject(IsolatedQuerySpace);
+  private readonly boardService = inject(BoardService);
+  private readonly boardActionRegistry = inject(BoardActionsRegistryService);
+  readonly I18n = inject(I18nService);
+
   @Input() board:Board;
 
   @Output() onRemove = new EventEmitter<void>();
 
-  constructor(readonly opModalService:OpModalService,
-    readonly authorisationService:AuthorisationService,
-    private readonly querySpace:IsolatedQuerySpace,
-    private readonly boardService:BoardService,
-    private readonly boardActionRegistry:BoardActionsRegistryService,
-    readonly I18n:I18nService) {
-  }
-
   public get menuItems() {
     return async () => {
       const items:OpContextMenuItem[] = [
diff --git a/frontend/src/app/features/boards/board/board-list/board-list.component.ts b/frontend/src/app/features/boards/board/board-list/board-list.component.ts
index cf85cae64e2..6b3df5dc4f6 100644
--- a/frontend/src/app/features/boards/board/board-list/board-list.component.ts
+++ b/frontend/src/app/features/boards/board/board-list/board-list.component.ts
@@ -5,7 +5,6 @@ import {
   ElementRef,
   EventEmitter,
   inject,
-  Injector,
   Input,
   OnDestroy,
   OnInit,
@@ -19,7 +18,6 @@ import {
 import { WorkPackageInlineCreateService } from 'core-app/features/work-packages/components/wp-inline-create/wp-inline-create.service';
 import { BoardInlineCreateService } from 'core-app/features/boards/board/board-list/board-inline-create.service';
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { Board } from 'core-app/features/boards/board/board';
@@ -89,6 +87,31 @@ export interface DisabledButtonPlaceholder {
   standalone: false,
 })
 export class BoardListComponent extends AbstractWidgetComponent implements OnInit, OnDestroy {
+  readonly apiv3Service = inject(ApiV3Service);
+  readonly state = inject(StateService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly transitions = inject(TransitionService);
+  readonly boardFilters = inject(BoardFiltersService);
+  readonly toastService = inject(ToastService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly halEvents = inject(HalEventsService);
+  readonly wpStatesInitialization = inject(WorkPackageStatesInitializationService);
+  readonly wpViewFocusService = inject(WorkPackageViewFocusService);
+  readonly wpViewSelectionService = inject(WorkPackageViewSelectionService);
+  readonly boardListCrossSelectionService = inject(BoardListCrossSelectionService);
+  readonly authorisationService = inject(AuthorisationService);
+  readonly wpInlineCreate = inject(WorkPackageInlineCreateService);
+  readonly halEditing = inject(HalResourceEditingService);
+  readonly loadingIndicator = inject(LoadingIndicatorService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly boardService = inject(BoardService);
+  readonly boardActionRegistry = inject(BoardActionsRegistryService);
+  readonly causedUpdates = inject(CausedUpdatesService);
+  readonly keepTab = inject(KeepTabService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly pathHelper = inject(PathHelperService);
+
   /** Output fired upon query removal */
   @Output() onRemove = new EventEmitter<void>();
 
@@ -127,13 +150,15 @@ export class BoardListComponent extends AbstractWidgetComponent implements OnIni
 
   public columnsQueryProps:any;
 
-  public text = {
-    addCard: this.I18n.t('js.boards.add_card'),
-    updateSuccessful: this.I18n.t('js.notice_successful_update'),
-    areYouSure: this.I18n.t('js.text_are_you_sure'),
-    unnamed_list: this.I18n.t('js.boards.label_unnamed_list'),
-    click_to_remove: this.I18n.t('js.boards.click_to_remove_list'),
-  };
+  public get text() {
+    return {
+      addCard: this.i18n.t('js.boards.add_card'),
+      updateSuccessful: this.i18n.t('js.notice_successful_update'),
+      areYouSure: this.i18n.t('js.text_are_you_sure'),
+      unnamed_list: this.i18n.t('js.boards.label_unnamed_list'),
+      click_to_remove: this.i18n.t('js.boards.click_to_remove_list'),
+    };
+  }
 
   /** Are we allowed to remove and drag & drop elements ? */
   public canDragInto = false;
@@ -153,37 +178,6 @@ export class BoardListComponent extends AbstractWidgetComponent implements OnIni
 
   private readonly states = inject(States);
 
-  constructor(
-    readonly apiv3Service:ApiV3Service,
-    readonly I18n:I18nService,
-    readonly state:StateService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly transitions:TransitionService,
-    readonly boardFilters:BoardFiltersService,
-    readonly toastService:ToastService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly halNotification:HalResourceNotificationService,
-    readonly halEvents:HalEventsService,
-    readonly wpStatesInitialization:WorkPackageStatesInitializationService,
-    readonly wpViewFocusService:WorkPackageViewFocusService,
-    readonly wpViewSelectionService:WorkPackageViewSelectionService,
-    readonly boardListCrossSelectionService:BoardListCrossSelectionService,
-    readonly authorisationService:AuthorisationService,
-    readonly wpInlineCreate:WorkPackageInlineCreateService,
-    readonly injector:Injector,
-    readonly halEditing:HalResourceEditingService,
-    readonly loadingIndicator:LoadingIndicatorService,
-    readonly schemaCache:SchemaCacheService,
-    readonly boardService:BoardService,
-    readonly boardActionRegistry:BoardActionsRegistryService,
-    readonly causedUpdates:CausedUpdatesService,
-    readonly keepTab:KeepTabService,
-    readonly currentProject:CurrentProjectService,
-    readonly pathHelper:PathHelperService,
-  ) {
-    super(I18n, injector);
-  }
-
   ngOnInit():void {
     // Unset the isNew flag
     this.initiallyFocused = this.resource.isNewWidget;
@@ -257,7 +251,7 @@ export class BoardListComponent extends AbstractWidgetComponent implements OnIni
   }
 
   public get errorMessage() {
-    return this.I18n.t('js.boards.error_loading_the_list', { error_message: this.loadingError });
+    return this.i18n.t('js.boards.error_loading_the_list', { error_message: this.loadingError });
   }
 
   public canMove(workPackage:WorkPackageResource) {
diff --git a/frontend/src/app/features/boards/board/board-list/board-lists.service.ts b/frontend/src/app/features/boards/board/board-list/board-lists.service.ts
index 86bbbd2a378..8c6c63adec1 100644
--- a/frontend/src/app/features/boards/board/board-list/board-lists.service.ts
+++ b/frontend/src/app/features/boards/board/board-list/board-lists.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
@@ -19,18 +19,15 @@ import { IOPFieldSchema } from 'core-app/features/hal/interfaces';
 
 @Injectable({ providedIn: 'root' })
 export class BoardListsService {
+  private readonly CurrentProject = inject(CurrentProjectService);
+  private readonly pathHelper = inject(PathHelperService);
+  private readonly apiV3Service = inject(ApiV3Service);
+  private readonly halResourceService = inject(HalResourceService);
+  private readonly toastService = inject(ToastService);
+  private readonly I18n = inject(I18nService);
+
   private v3 = this.pathHelper.api.v3;
 
-  constructor(
-    private readonly CurrentProject:CurrentProjectService,
-    private readonly pathHelper:PathHelperService,
-    private readonly apiV3Service:ApiV3Service,
-    private readonly halResourceService:HalResourceService,
-    private readonly toastService:ToastService,
-    private readonly I18n:I18nService) {
-
-  }
-
   private create(params:object, filters:ApiV3Filter[]):Observable<QueryResource> {
     const filterJson = JSON.stringify(filters);
 
diff --git a/frontend/src/app/features/boards/board/board-partitioned-page/board-entry.component.ts b/frontend/src/app/features/boards/board/board-partitioned-page/board-entry.component.ts
index 1fe536a15eb..e0ef5fdbc67 100644
--- a/frontend/src/app/features/boards/board/board-partitioned-page/board-entry.component.ts
+++ b/frontend/src/app/features/boards/board/board-partitioned-page/board-entry.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  Injector,
-  Input,
-  OnDestroy,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Injector, Input, OnDestroy, inject } from '@angular/core';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
@@ -64,12 +57,14 @@ import { QueryUpdatedService } from 'core-app/features/boards/board/query-update
   standalone: false,
 })
 export class BoardEntryComponent implements OnDestroy {
+  readonly elementRef = inject(ElementRef);
+  readonly injector = inject(Injector);
+
   @Input() boardId:string;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly injector:Injector,
-  ) {
+  constructor() {
+    const injector = this.injector;
+
     populateInputsFromDataset(this);
 
     document.body.classList.add('router--boards-full-view');
diff --git a/frontend/src/app/features/boards/board/board-partitioned-page/board-list-container.component.ts b/frontend/src/app/features/boards/board/board-partitioned-page/board-list-container.component.ts
index d033ea67e5e..2fd95d3ef04 100644
--- a/frontend/src/app/features/boards/board/board-partitioned-page/board-list-container.component.ts
+++ b/frontend/src/app/features/boards/board/board-partitioned-page/board-list-container.component.ts
@@ -54,6 +54,24 @@ import { resolveRoutingId } from 'core-app/features/work-packages/helpers/work-p
   standalone: false,
 })
 export class BoardListContainerComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly state = inject(StateService);
+  readonly toastService = inject(ToastService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly boardComponent = inject(BoardPartitionedPageComponent);
+  readonly BoardList = inject(BoardListsService);
+  readonly boardActionRegistry = inject(BoardActionsRegistryService);
+  readonly opModalService = inject(OpModalService);
+  readonly injector = inject(Injector);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly Boards = inject(BoardService);
+  readonly boardListCrossSelectionService = inject(BoardListCrossSelectionService);
+  readonly Drag = inject(DragAndDropService);
+  readonly apiv3Service = inject(ApiV3Service);
+  readonly QueryUpdated = inject(QueryUpdatedService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly currentProject = inject(CurrentProjectService);
+
   @Input() boardId:string;
   text = {
     delete: this.I18n.t('js.button_delete'),
@@ -96,28 +114,6 @@ export class BoardListContainerComponent extends UntilDestroyedMixin implements
 
   private readonly wpStates = inject(States);
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly state:StateService,
-    readonly toastService:ToastService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly boardComponent:BoardPartitionedPageComponent,
-    readonly BoardList:BoardListsService,
-    readonly boardActionRegistry:BoardActionsRegistryService,
-    readonly opModalService:OpModalService,
-    readonly injector:Injector,
-    readonly apiV3Service:ApiV3Service,
-    readonly Boards:BoardService,
-    readonly boardListCrossSelectionService:BoardListCrossSelectionService,
-    readonly Drag:DragAndDropService,
-    readonly apiv3Service:ApiV3Service,
-    readonly QueryUpdated:QueryUpdatedService,
-    readonly pathHelper:PathHelperService,
-    readonly currentProject:CurrentProjectService,
-) {
-    super();
-  }
-
   ngOnInit():void {
     const id:string = this.boardId || this.state.params.board_id?.toString();
     this.board$ = this
diff --git a/frontend/src/app/features/boards/board/board-partitioned-page/board-partitioned-page.component.ts b/frontend/src/app/features/boards/board/board-partitioned-page/board-partitioned-page.component.ts
index 464c05c4a7a..4d127e62e7e 100644
--- a/frontend/src/app/features/boards/board/board-partitioned-page/board-partitioned-page.component.ts
+++ b/frontend/src/app/features/boards/board/board-partitioned-page/board-partitioned-page.component.ts
@@ -1,11 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Injector,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, Input, OnInit, inject } from '@angular/core';
 import {
   DynamicComponentDefinition,
   ToolbarButtonComponentDefinition,
@@ -60,6 +53,20 @@ export function boardCardViewHandlerFactory(injector:Injector) {
   standalone: false,
 })
 export class BoardPartitionedPageComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly state = inject(StateService);
+  readonly toastService = inject(ToastService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly injector = inject(Injector);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly boardFilters = inject(BoardFiltersService);
+  readonly Boards = inject(BoardService);
+  readonly titleService = inject(OpTitleService);
+  readonly submenuService = inject(SubmenuService);
+  readonly pathHelperService = inject(PathHelperService);
+  readonly currentProject = inject(CurrentProjectService);
+
   @Input() boardId:string;
   text = {
     button_more: this.I18n.t('js.button_more'),
@@ -129,24 +136,6 @@ export class BoardPartitionedPageComponent extends UntilDestroyedMixin implement
     },
   ];
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly state:StateService,
-    readonly toastService:ToastService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly injector:Injector,
-    readonly apiV3Service:ApiV3Service,
-    readonly boardFilters:BoardFiltersService,
-    readonly Boards:BoardService,
-    readonly titleService:OpTitleService,
-    readonly submenuService:SubmenuService,
-    readonly pathHelperService:PathHelperService,
-    readonly currentProject:CurrentProjectService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     // Ensure board is being loaded
     this.Boards.loadAllBoards();
diff --git a/frontend/src/app/features/boards/board/board.service.ts b/frontend/src/app/features/boards/board/board.service.ts
index 143b2dd1a6d..11eda6477d9 100644
--- a/frontend/src/app/features/boards/board/board.service.ts
+++ b/frontend/src/app/features/boards/board/board.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -10,6 +10,12 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 
 @Injectable({ providedIn: 'root' })
 export class BoardService {
+  protected apiV3Service = inject(ApiV3Service);
+  protected PathHelper = inject(PathHelperService);
+  protected CurrentProject = inject(CurrentProjectService);
+  protected halResourceService = inject(HalResourceService);
+  protected I18n = inject(I18nService);
+
   public currentBoard$:BehaviorSubject<string|null> = new BehaviorSubject<string|null>(null);
 
   private loadAllPromise:Promise<Board[]>|undefined;
@@ -21,15 +27,6 @@ export class BoardService {
     unnamed_list: this.I18n.t('js.boards.label_unnamed_list'),
   };
 
-  constructor(
-    protected apiV3Service:ApiV3Service,
-    protected PathHelper:PathHelperService,
-    protected CurrentProject:CurrentProjectService,
-    protected halResourceService:HalResourceService,
-    protected I18n:I18nService,
-  ) {
-  }
-
   /**
    * Return all boards in the current scope of the project
    *
diff --git a/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.ts b/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.ts
index a24aee77456..503bcbdc247 100644
--- a/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.ts
+++ b/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.ts
@@ -1,19 +1,5 @@
-import {
-  ApplicationRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ComponentFactoryResolver,
-  ElementRef,
-  Inject,
-  Injector,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ApplicationRef, ChangeDetectionStrategy, Component, ComponentFactoryResolver, ElementRef, Injector, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import {
   ActiveTabInterface,
   TabComponent,
@@ -34,6 +20,13 @@ import { Board } from 'core-app/features/boards/board/board';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BoardConfigurationModalComponent extends OpModalComponent implements OnInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly boardService = inject(BoardService);
+  readonly boardConfigurationService = inject(BoardConfigurationService);
+  readonly injector = inject(Injector);
+  readonly appRef = inject(ApplicationRef);
+  readonly componentFactoryResolver = inject(ComponentFactoryResolver);
+
   public text = {
     title: this.I18n.t('js.boards.configuration_modal.title'),
     closePopup: this.I18n.t('js.close_popup_title'),
@@ -48,18 +41,6 @@ export class BoardConfigurationModalComponent extends OpModalComponent implement
   // And a reference to the actual portal host interface
   public tabPortalHost:TabPortalOutlet;
 
-  constructor(@Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService,
-    readonly boardService:BoardService,
-    readonly boardConfigurationService:BoardConfigurationService,
-    readonly injector:Injector,
-    readonly appRef:ApplicationRef,
-    readonly componentFactoryResolver:ComponentFactoryResolver,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit() {
     this.element = this.elementRef.nativeElement as HTMLElement;
 
diff --git a/frontend/src/app/features/boards/board/configuration-modal/board-configuration.service.ts b/frontend/src/app/features/boards/board/configuration-modal/board-configuration.service.ts
index 6cbd5f3ef95..933b78ce798 100644
--- a/frontend/src/app/features/boards/board/configuration-modal/board-configuration.service.ts
+++ b/frontend/src/app/features/boards/board/configuration-modal/board-configuration.service.ts
@@ -1,10 +1,12 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TabInterface } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
 import { BoardHighlightingTabComponent } from 'core-app/features/boards/board/configuration-modal/tabs/highlighting-tab.component';
 
 @Injectable()
 export class BoardConfigurationService {
+  readonly I18n = inject(I18nService);
+
   protected _tabs:TabInterface[] = [
     {
       id: 'highlighting',
@@ -13,9 +15,6 @@ export class BoardConfigurationService {
     },
   ];
 
-  constructor(readonly I18n:I18nService) {
-  }
-
   public get tabs() {
     return this._tabs;
   }
diff --git a/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.ts b/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.ts
index 489277262d9..e37f4ef97d2 100644
--- a/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.ts
+++ b/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Inject, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
 import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
@@ -15,6 +15,10 @@ import { CardHighlightingMode } from 'core-app/features/work-packages/components
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BoardHighlightingTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  locals = inject<OpModalLocalsMap>(OpModalLocalsToken);
+  readonly I18n = inject(I18nService);
+
   // Highlighting mode
   public highlightingMode:CardHighlightingMode = 'none';
 
@@ -35,11 +39,6 @@ export class BoardHighlightingTabComponent implements TabComponent, OnInit {
     },
   };
 
-  constructor(readonly injector:Injector,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService) {
-  }
-
   public onSave() {
     this.updateMode(this.highlightingMode);
     this.board.highlightingMode = this.highlightingMode;
diff --git a/frontend/src/app/features/boards/board/inline-add/board-inline-add-autocompleter.component.ts b/frontend/src/app/features/boards/board/inline-add/board-inline-add-autocompleter.component.ts
index 540b2176523..4476279bb3f 100644
--- a/frontend/src/app/features/boards/board/inline-add/board-inline-add-autocompleter.component.ts
+++ b/frontend/src/app/features/boards/board/inline-add/board-inline-add-autocompleter.component.ts
@@ -26,17 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { Observable, of } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
@@ -66,6 +56,18 @@ import { HalResourceService } from 'core-app/features/hal/services/hal-resource.
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BoardInlineAddAutocompleterComponent implements AfterViewInit {
+  private readonly querySpace = inject(IsolatedQuerySpace);
+  private readonly pathHelper = inject(PathHelperService);
+  private readonly apiV3Service = inject(ApiV3Service);
+  private readonly urlParamsHelper = inject(UrlParamsHelperService);
+  private readonly notificationService = inject(WorkPackageNotificationService);
+  private readonly CurrentProject = inject(CurrentProjectService);
+  private readonly halResourceService = inject(HalResourceService);
+  private readonly schemaCacheService = inject(SchemaCacheService);
+  private readonly cdRef = inject(ChangeDetectorRef);
+  private readonly I18n = inject(I18nService);
+  private readonly wpCardDragDrop = inject(WorkPackageCardDragAndDropService);
+
   readonly text = {
     placeholder: this.I18n.t('js.relations_autocomplete.placeholder'),
   };
@@ -119,19 +121,6 @@ export class BoardInlineAddAutocompleterComponent implements AfterViewInit {
 
   @Output() onReferenced = new EventEmitter<WorkPackageResource>();
 
-  constructor(private readonly querySpace:IsolatedQuerySpace,
-    private readonly pathHelper:PathHelperService,
-    private readonly apiV3Service:ApiV3Service,
-    private readonly urlParamsHelper:UrlParamsHelperService,
-    private readonly notificationService:WorkPackageNotificationService,
-    private readonly CurrentProject:CurrentProjectService,
-    private readonly halResourceService:HalResourceService,
-    private readonly schemaCacheService:SchemaCacheService,
-    private readonly cdRef:ChangeDetectorRef,
-    private readonly I18n:I18nService,
-    private readonly wpCardDragDrop:WorkPackageCardDragAndDropService) {
-  }
-
   ngAfterViewInit():void {
     if (!this.ngSelectComponent.ngSelectInstance) {
       return;
diff --git a/frontend/src/app/features/boards/board/query-updated/query-updated.service.ts b/frontend/src/app/features/boards/board/query-updated/query-updated.service.ts
index 9fedd7401cb..fa2770625bd 100644
--- a/frontend/src/app/features/boards/board/query-updated/query-updated.service.ts
+++ b/frontend/src/app/features/boards/board/query-updated/query-updated.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { interval } from 'rxjs';
 import { filter, startWith, switchMap } from 'rxjs/operators';
 import { ActiveWindowService } from 'core-app/core/active-window/active-window.service';
@@ -8,9 +8,9 @@ const POLLING_INTERVAL = 2000;
 
 @Injectable()
 export class QueryUpdatedService {
-  constructor(readonly activeWindow:ActiveWindowService,
-    readonly apiV3Service:ApiV3Service) {
-  }
+  readonly activeWindow = inject(ActiveWindowService);
+  readonly apiV3Service = inject(ApiV3Service);
+
 
   public monitor(ids:string[]) {
     let time = new Date();
diff --git a/frontend/src/app/features/boards/board/toolbar-menu/boards-menu-button.component.ts b/frontend/src/app/features/boards/board/toolbar-menu/boards-menu-button.component.ts
index 758fd6ad1d7..714c5c79adb 100644
--- a/frontend/src/app/features/boards/board/toolbar-menu/boards-menu-button.component.ts
+++ b/frontend/src/app/features/boards/board/toolbar-menu/boards-menu-button.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { Board } from 'core-app/features/boards/board/board';
 import { Observable } from 'rxjs';
@@ -19,12 +19,11 @@ import { Observable } from 'rxjs';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class BoardsMenuButtonComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() board$:Observable<Board>;
 
   text = {
     button_more: this.I18n.t('js.button_more'),
   };
-
-  constructor(readonly I18n:I18nService) {
-  }
 }
diff --git a/frontend/src/app/features/boards/board/toolbar-menu/boards-toolbar-menu.directive.ts b/frontend/src/app/features/boards/board/toolbar-menu/boards-toolbar-menu.directive.ts
index ce45ca6d7ae..156f48fb0af 100644
--- a/frontend/src/app/features/boards/board/toolbar-menu/boards-toolbar-menu.directive.ts
+++ b/frontend/src/app/features/boards/board/toolbar-menu/boards-toolbar-menu.directive.ts
@@ -26,13 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  Directive, ElementRef, Injector, Input,
-} from '@angular/core';
+import { Directive, Injector, Input, inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { Board } from 'core-app/features/boards/board/board';
 import { BoardConfigurationModalComponent } from 'core-app/features/boards/board/configuration-modal/board-configuration.modal';
@@ -46,21 +43,16 @@ import { selectableTitleIdentifier, triggerEditingEvent } from 'core-app/shared/
   standalone: false,
 })
 export class BoardsToolbarMenuDirective extends OpContextMenuTrigger {
-  @Input('boardsToolbarMenu-resource') public board:Board;
+  readonly opModalService = inject(OpModalService);
+  readonly boardService = inject(BoardService);
+  readonly Notifications = inject(ToastService);
+  readonly State = inject(StateService);
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly http = inject(HttpClient);
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly opModalService:OpModalService,
-    readonly boardService:BoardService,
-    readonly Notifications:ToastService,
-    readonly State:StateService,
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly http:HttpClient,
-  ) {
-    super(elementRef, opContextMenu);
-  }
+  // eslint-disable-next-line @angular-eslint/no-input-rename
+  @Input('boardsToolbarMenu-resource') public board:Board;
 
   public get locals() {
     return {
diff --git a/frontend/src/app/features/calendar/calendar-entry.component.ts b/frontend/src/app/features/calendar/calendar-entry.component.ts
index 645a7efd35d..6d7343e01a8 100644
--- a/frontend/src/app/features/calendar/calendar-entry.component.ts
+++ b/frontend/src/app/features/calendar/calendar-entry.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  Input,
-  OnDestroy,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnDestroy, inject } from '@angular/core';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
@@ -45,9 +39,11 @@ import {
   standalone: false,
 })
 export class CalendarEntryComponent implements OnDestroy {
+  readonly elementRef = inject(ElementRef);
+
   @Input() queryId:string;
 
-  constructor(readonly elementRef:ElementRef) {
+  constructor() {
     populateInputsFromDataset(this);
     document.body.classList.add('router--calendar');
   }
diff --git a/frontend/src/app/features/calendar/op-calendar.service.spec.ts b/frontend/src/app/features/calendar/op-calendar.service.spec.ts
index 23ccec1742c..cd7cf47143e 100644
--- a/frontend/src/app/features/calendar/op-calendar.service.spec.ts
+++ b/frontend/src/app/features/calendar/op-calendar.service.spec.ts
@@ -26,16 +26,25 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { TestBed } from '@angular/core/testing';
 import { OpCalendarService } from 'core-app/features/calendar/op-calendar.service';
+import { WeekdayService } from 'core-app/core/days/weekday.service';
+import { DayResourceService } from 'core-app/core/state/days/day.service';
+import { ConfigurationService } from 'core-app/core/config/configuration.service';
 
 describe('OP calendar service', () => {
   let service:OpCalendarService;
 
   beforeEach(() => {
-    // This is not a valid constructor call, but since we only want to test a helper method that does not
-    // depend on injected services, we can pass null values here.
-    // @ts-expect-error ignore invalid constructor call since we don't need a completely valid instance
-    service = new OpCalendarService(null, null, null);
+    TestBed.configureTestingModule({
+      providers: [
+        OpCalendarService,
+        { provide: WeekdayService, useValue: {} },
+        { provide: DayResourceService, useValue: {} },
+        { provide: ConfigurationService, useValue: {} },
+      ],
+    });
+    service = TestBed.inject(OpCalendarService);
   });
 
   describe('stripYearFromDateFormat', () => {
diff --git a/frontend/src/app/features/calendar/op-calendar.service.ts b/frontend/src/app/features/calendar/op-calendar.service.ts
index e59d607e81f..a8f63538014 100644
--- a/frontend/src/app/features/calendar/op-calendar.service.ts
+++ b/frontend/src/app/features/calendar/op-calendar.service.ts
@@ -1,7 +1,4 @@
-import {
-  ElementRef,
-  Injectable,
-} from '@angular/core';
+import { ElementRef, Injectable, inject } from '@angular/core';
 import { Subject } from 'rxjs';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { WeekdayService } from 'core-app/core/days/weekday.service';
@@ -13,18 +10,14 @@ import { DayHeaderContentArg } from '@fullcalendar/core';
 
 @Injectable()
 export class OpCalendarService extends UntilDestroyedMixin {
+  readonly weekdayService = inject(WeekdayService);
+  readonly dayService = inject(DayResourceService);
+  readonly configurationService = inject(ConfigurationService);
+
   resize$ = new Subject<void>();
 
   resizeObs:ResizeObserver;
 
-  constructor(
-    readonly weekdayService:WeekdayService,
-    readonly dayService:DayResourceService,
-    readonly configurationService:ConfigurationService,
-  ) {
-    super();
-  }
-
   resizeObserver(v:ElementRef|undefined):void {
     if (!v) {
       return;
diff --git a/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts b/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts
index 5184f8c5be1..641751a4e31 100644
--- a/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts
+++ b/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts
@@ -75,6 +75,28 @@ interface CalendarOptionsWithDayGrid extends CalendarOptions {
 
 @Injectable()
 export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
+  private I18n = inject(I18nService);
+  private configuration = inject(ConfigurationService);
+  private sanitizer = inject(DomSanitizer);
+  readonly injector = inject(Injector);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly toastService = inject(ToastService);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpListService = inject(WorkPackagesListService);
+  readonly wpListChecksumService = inject(WorkPackagesListChecksumService);
+  readonly urlParamsHelper = inject(UrlParamsHelperService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly halResourceService = inject(HalResourceService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly halEditing = inject(HalResourceEditingService);
+  readonly wpTableSelection = inject(WorkPackageViewSelectionService);
+  readonly contextMenuService = inject(OPContextMenuService);
+  readonly calendarService = inject(OpCalendarService);
+  readonly weekdayService = inject(WeekdayService);
+  readonly dayService = inject(DayResourceService);
+
   static MAX_DISPLAYED = 500;
 
   tooManyResultsText:string|null;
@@ -91,32 +113,6 @@ export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
 
   private readonly states = inject(States);
 
-  constructor(
-    private I18n:I18nService,
-    private configuration:ConfigurationService,
-    private sanitizer:DomSanitizer,
-    readonly injector:Injector,
-    readonly schemaCache:SchemaCacheService,
-    readonly toastService:ToastService,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpListService:WorkPackagesListService,
-    readonly wpListChecksumService:WorkPackagesListChecksumService,
-    readonly urlParamsHelper:UrlParamsHelperService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly apiV3Service:ApiV3Service,
-    readonly halResourceService:HalResourceService,
-    readonly timezoneService:TimezoneService,
-    readonly pathHelper:PathHelperService,
-    readonly halEditing:HalResourceEditingService,
-    readonly wpTableSelection:WorkPackageViewSelectionService,
-    readonly contextMenuService:OPContextMenuService,
-    readonly calendarService:OpCalendarService,
-    readonly weekdayService:WeekdayService,
-    readonly dayService:DayResourceService,
-  ) {
-    super();
-  }
-
   calendarOptions(additionalOptions:CalendarOptions):CalendarOptions {
     return { ...this.defaultOptions(), ...additionalOptions };
   }
diff --git a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
index c47d86ceb7e..3d2f844f2b0 100644
--- a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
+++ b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
@@ -1,17 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Injector,
-  Input,
-  OnDestroy,
-  Output,
-  SecurityContext,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Injector, Input, OnDestroy, Output, SecurityContext, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { FullCalendarComponent } from '@fullcalendar/angular';
 import { States } from 'core-app/core/states/states.service';
 import moment, { Moment } from 'moment';
@@ -115,6 +102,25 @@ const ADD_ENTRY_PROHIBITED_CLASS_NAME = '-prohibited';
   standalone: false,
 })
 export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy {
+  readonly states = inject(States);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly $state = inject(StateService);
+  private element = inject(ElementRef);
+  readonly i18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly notifications = inject(HalResourceNotificationService);
+  private sanitizer = inject(DomSanitizer);
+  private configuration = inject(ConfigurationService);
+  private timezone = inject(TimezoneService);
+  private schemaCache = inject(SchemaCacheService);
+  private colors = inject(ColorsService);
+  private browserDetector = inject(BrowserDetector);
+  private calendar = inject(OpCalendarService);
+  readonly weekdayService = inject(WeekdayService);
+  readonly dayService = inject(DayResourceService);
+  readonly turboRequests = inject(TurboRequestsService);
+  readonly pathHelper = inject(PathHelperService);
+
   @ViewChild(FullCalendarComponent) ucCalendar:FullCalendarComponent;
 
   @Input() projectIdentifier:string;
@@ -202,27 +208,6 @@ export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy {
       });
   }
 
-  constructor(
-    readonly states:States,
-    readonly apiV3Service:ApiV3Service,
-    readonly $state:StateService,
-    private element:ElementRef,
-    readonly i18n:I18nService,
-    readonly injector:Injector,
-    readonly notifications:HalResourceNotificationService,
-    private sanitizer:DomSanitizer,
-    private configuration:ConfigurationService,
-    private timezone:TimezoneService,
-    private schemaCache:SchemaCacheService,
-    private colors:ColorsService,
-    private browserDetector:BrowserDetector,
-    private calendar:OpCalendarService,
-    readonly weekdayService:WeekdayService,
-    readonly dayService:DayResourceService,
-    readonly turboRequests:TurboRequestsService,
-    readonly pathHelper:PathHelperService,
-  ) { }
-
   ngAfterViewInit():void {
     document.addEventListener('dialog:close', this.closeDialogHandler);
   }
diff --git a/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts b/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts
index 7c60b93882b..5fe76aa445b 100644
--- a/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts
+++ b/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  Input,
-  OnInit,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import {
   CalendarOptions,
   DateSelectArg,
@@ -103,6 +95,29 @@ import { TimezoneService } from 'core-app/core/datetime/timezone.service';
   standalone: false,
 })
 export class WorkPackagesCalendarComponent extends UntilDestroyedMixin implements OnInit {
+  readonly actions$ = inject(ActionsService);
+  readonly states = inject(States);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpListService = inject(WorkPackagesListService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly schemaCache = inject(SchemaCacheService);
+  private element = inject(ElementRef);
+  readonly i18n = inject(I18nService);
+  readonly toastService = inject(ToastService);
+  private sanitizer = inject(DomSanitizer);
+  private I18n = inject(I18nService);
+  private configuration = inject(ConfigurationService);
+  readonly calendar = inject(OpCalendarService);
+  readonly workPackagesCalendar = inject(OpWorkPackagesCalendarService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly halEditing = inject(HalResourceEditingService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly weekdayService = inject(WeekdayService);
+  readonly dayService = inject(DayResourceService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly pathHelper = inject(PathHelperService);
+  readonly timezoneService = inject(TimezoneService);
+
   @ViewChild(FullCalendarComponent) ucCalendar:FullCalendarComponent;
 
   @ViewChild('ucCalendar', { read: ElementRef })
@@ -123,33 +138,6 @@ export class WorkPackagesCalendarComponent extends UntilDestroyedMixin implement
     today: this.I18n.t('js.team_planner.today'),
   };
 
-  constructor(
-    readonly actions$:ActionsService,
-    readonly states:States,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpListService:WorkPackagesListService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly schemaCache:SchemaCacheService,
-    private element:ElementRef,
-    readonly i18n:I18nService,
-    readonly toastService:ToastService,
-    private sanitizer:DomSanitizer,
-    private I18n:I18nService,
-    private configuration:ConfigurationService,
-    readonly calendar:OpCalendarService,
-    readonly workPackagesCalendar:OpWorkPackagesCalendarService,
-    readonly currentProject:CurrentProjectService,
-    readonly halEditing:HalResourceEditingService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly weekdayService:WeekdayService,
-    readonly dayService:DayResourceService,
-    readonly apiV3Service:ApiV3Service,
-    readonly pathHelper:PathHelperService,
-    readonly timezoneService:TimezoneService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     registerEffectCallbacks(this, this.untilDestroyed());
 
diff --git a/frontend/src/app/features/enterprise/enterprise-banner-frame.component.ts b/frontend/src/app/features/enterprise/enterprise-banner-frame.component.ts
index 62aa7175b5c..971277fe9fd 100644
--- a/frontend/src/app/features/enterprise/enterprise-banner-frame.component.ts
+++ b/frontend/src/app/features/enterprise/enterprise-banner-frame.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { BannersService } from 'core-app/core/enterprise/banners.service';
 
@@ -37,6 +37,9 @@ import { BannersService } from 'core-app/core/enterprise/banners.service';
   standalone: false,
 })
 export class EnterpriseBannerFrameComponent implements OnInit {
+  protected pathHelper = inject(PathHelperService);
+  protected banners = inject(BannersService);
+
   @Input() public feature:string;
 
   @Input() public dismissable = false;
@@ -45,12 +48,6 @@ export class EnterpriseBannerFrameComponent implements OnInit {
   frameURL:string;
   frameID:string;
 
-  constructor(
-    protected pathHelper:PathHelperService,
-    protected banners:BannersService,
-  ) {
-  }
-
   ngOnInit() {
     this.visible = this.banners.showBannerFor(this.feature);
     this.frameURL = this.pathHelper.bannerFramePath(this.feature, this.dismissable);
diff --git a/frontend/src/app/features/hal/services/hal-aware-error-handler.ts b/frontend/src/app/features/hal/services/hal-aware-error-handler.ts
index 46075f34ca1..3cfe401f624 100644
--- a/frontend/src/app/features/hal/services/hal-aware-error-handler.ts
+++ b/frontend/src/app/features/hal/services/hal-aware-error-handler.ts
@@ -1,7 +1,4 @@
-import {
-  ErrorHandler,
-  Injectable,
-} from '@angular/core';
+import { ErrorHandler, Injectable, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { ErrorResource } from 'core-app/features/hal/resources/error-resource';
@@ -14,14 +11,12 @@ interface RejectedPromise {
 
 @Injectable()
 export class HalAwareErrorHandler extends ErrorHandler {
+  private readonly I18n = inject(I18nService);
+
   private text = {
     internal_error: this.I18n.t('js.error.internal'),
   };
 
-  constructor(private readonly I18n:I18nService) {
-    super();
-  }
-
   public handleError(error:unknown):void {
     let message:string = this.text.internal_error;
 
diff --git a/frontend/src/app/features/hal/services/hal-resource-notification.service.ts b/frontend/src/app/features/hal/services/hal-resource-notification.service.ts
index dbfb1d344e5..709804c8077 100644
--- a/frontend/src/app/features/hal/services/hal-resource-notification.service.ts
+++ b/frontend/src/app/features/hal/services/hal-resource-notification.service.ts
@@ -28,7 +28,7 @@
 
 import { StateService } from '@uirouter/core';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { LoadingIndicatorService } from 'core-app/core/loading-indicator/loading-indicator.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -41,6 +41,8 @@ import { HalError } from 'core-app/features/hal/services/hal-error';
 
 @Injectable()
 export class HalResourceNotificationService {
+  injector = inject(Injector);
+
   @InjectField() protected I18n:I18nService;
 
   @InjectField() protected $state:StateService;
@@ -53,9 +55,6 @@ export class HalResourceNotificationService {
 
   @InjectField() protected schemaCache:SchemaCacheService;
 
-  constructor(public injector:Injector) {
-  }
-
   public showSave(resource:HalResource, isCreate = false) {
     const message:any = {
       message: this.I18n.t(`js.notice_successful_${isCreate ? 'create' : 'update'}`),
diff --git a/frontend/src/app/features/hal/services/hal-resource.service.ts b/frontend/src/app/features/hal/services/hal-resource.service.ts
index 1d583726870..2d86b4f0eb1 100644
--- a/frontend/src/app/features/hal/services/hal-resource.service.ts
+++ b/frontend/src/app/features/hal/services/hal-resource.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { HttpClient, HttpErrorResponse, HttpParams } from '@angular/common/http';
 import { catchError, map } from 'rxjs/operators';
 import { Observable, throwError } from 'rxjs';
@@ -59,17 +59,14 @@ interface ErrorWithType {
 
 @Injectable({ providedIn: 'root' })
 export class HalResourceService {
+  readonly injector = inject(Injector);
+  readonly http = inject(HttpClient);
+
   /**
    * List of all known hal resources, extendable.
    */
   private config:Record<string, HalResourceFactoryConfigInterface> = {};
 
-  constructor(
-    readonly injector:Injector,
-    readonly http:HttpClient,
-  ) {
-  }
-
   /**
    * Perform a HTTP request and return a HalResource promise.
    */
diff --git a/frontend/src/app/features/in-app-notifications/bell/in-app-notification-bell.component.ts b/frontend/src/app/features/in-app-notifications/bell/in-app-notification-bell.component.ts
index 658aa051593..cf917c208a8 100644
--- a/frontend/src/app/features/in-app-notifications/bell/in-app-notification-bell.component.ts
+++ b/frontend/src/app/features/in-app-notifications/bell/in-app-notification-bell.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, HostListener } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, HostListener, inject } from '@angular/core';
 import { combineLatest, merge, Observable, timer } from 'rxjs';
 import { filter, map, shareReplay, switchMap, throttleTime } from 'rxjs/operators';
 import { ActiveWindowService } from 'core-app/core/active-window/active-window.service';
@@ -15,6 +15,12 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   standalone: false,
 })
 export class InAppNotificationBellComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  readonly storeService = inject(IanBellService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly activeWindow = inject(ActiveWindowService);
+  readonly pathHelper = inject(PathHelperService);
+
   @Input() interval = 50000;
 
   polling$:Observable<number>;
@@ -25,13 +31,7 @@ export class InAppNotificationBellComponent implements OnInit {
 
   public bellDisplayLimit = 99;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly storeService:IanBellService,
-    readonly apiV3Service:ApiV3Service,
-    readonly activeWindow:ActiveWindowService,
-    readonly pathHelper:PathHelperService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts b/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts
index 8c059b2665f..3263283204a 100644
--- a/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts
+++ b/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   catchError,
   map,
@@ -57,6 +57,9 @@ import { IanBellStore } from 'core-app/features/in-app-notifications/bell/state/
 @Injectable({ providedIn: 'root' })
 @EffectHandler
 export class IanBellService {
+  readonly actions$ = inject(ActionsService);
+  readonly resourceService = inject(InAppNotificationsResourceService);
+
   readonly id = 'ian-bell';
 
   readonly store = new IanBellStore();
@@ -65,10 +68,7 @@ export class IanBellService {
 
   unread$ = this.query.unread$;
 
-  constructor(
-    readonly actions$:ActionsService,
-    readonly resourceService:InAppNotificationsResourceService,
-  ) {
+  constructor() {
     this.query.unreadCountChanged$.subscribe((count) => {
       this.actions$.dispatch(notificationCountChanged({ origin: this.id, count }));
     });
diff --git a/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts b/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts
index 0760d630ab2..8d882fa961d 100644
--- a/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts
+++ b/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { filter, map } from 'rxjs/operators';
 import { StateService } from '@uirouter/angular';
@@ -52,6 +52,17 @@ import {
   standalone: false,
 })
 export class InAppNotificationCenterComponent implements OnInit {
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly elementRef = inject(ElementRef);
+  readonly I18n = inject(I18nService);
+  readonly storeService = inject(IanCenterService);
+  readonly bellService = inject(IanBellService);
+  readonly urlParams = inject(UrlParamsService);
+  readonly state = inject(StateService);
+  readonly apiV3 = inject(ApiV3Service);
+  readonly pathService = inject(PathHelperService);
+  readonly colorsService = inject(ColorsService);
+
   maxSize = NOTIFICATIONS_MAX_SIZE;
 
   hasMoreThanPageSize$ = this.storeService.hasMoreThanPageSize$;
@@ -141,20 +152,6 @@ export class InAppNotificationCenterComponent implements OnInit {
 
   protected readonly idFromLink = idFromLink;
 
-  constructor(
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-    readonly I18n:I18nService,
-    readonly storeService:IanCenterService,
-    readonly bellService:IanBellService,
-    readonly urlParams:UrlParamsService,
-    readonly state:StateService,
-    readonly apiV3:ApiV3Service,
-    readonly pathService:PathHelperService,
-    readonly colorsService:ColorsService,
-  ) {
-  }
-
   ngOnInit():void {
     const facet = this.urlParams.get('facet') || 'unread';
     this.storeService.setFacet(facet as 'unread'|'all');
diff --git a/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts b/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts
index d6361f137c0..31709f6a2fb 100644
--- a/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts
+++ b/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { debounceTime, defaultIfEmpty, distinctUntilChanged, map, mapTo, switchMap, take, tap } from 'rxjs/operators';
 import { forkJoin, from, Observable, Subject } from 'rxjs';
 import { ID, Query } from '@datorama/akita';
@@ -71,6 +71,18 @@ export interface INotificationPageQueryParameters {
 @Injectable({ providedIn: 'root' })
 @EffectHandler
 export class IanCenterService extends UntilDestroyedMixin {
+  readonly I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly resourceService = inject(InAppNotificationsResourceService);
+  readonly actions$ = inject(ActionsService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly toastService = inject(ToastService);
+  readonly urlParams = inject(UrlParamsService);
+  readonly state = inject(StateService);
+  readonly deviceService = inject(DeviceService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly ianBellService = inject(IanBellService);
+
   readonly id = 'ian-center';
 
   readonly store = new IanCenterStore();
@@ -182,19 +194,7 @@ export class IanCenterService extends UntilDestroyedMixin {
 
   selectedWorkPackage$ = this.urlParams.pathMatching$(/\/details\/(\d+)/);
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly injector:Injector,
-    readonly resourceService:InAppNotificationsResourceService,
-    readonly actions$:ActionsService,
-    readonly apiV3Service:ApiV3Service,
-    readonly toastService:ToastService,
-    readonly urlParams:UrlParamsService,
-    readonly state:StateService,
-    readonly deviceService:DeviceService,
-    readonly pathHelper:PathHelperService,
-    readonly ianBellService:IanBellService,
-  ) {
+  constructor() {
     super();
     this.reload.subscribe();
 
diff --git a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts
index 9ceab9a5b41..df7f859d9f1 100644
--- a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { DeviceService } from 'core-app/core/browser/device.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
@@ -13,6 +13,9 @@ import { PrincipalLike } from 'core-app/shared/components/principal/principal-ty
   standalone: false,
 })
 export class InAppNotificationActorsLineComponent implements OnInit {
+  readonly deviceService = inject(DeviceService);
+  private I18n = inject(I18nService);
+
   @HostBinding('class.op-ian-actors') className = true;
 
   @Input() aggregatedNotifications:INotification[];
@@ -34,11 +37,6 @@ export class InAppNotificationActorsLineComponent implements OnInit {
     mark_as_read: this.I18n.t('js.notifications.center.mark_as_read'),
   };
 
-  constructor(
-    readonly deviceService:DeviceService,
-    private I18n:I18nService,
-  ) { }
-
   ngOnInit():void {
     // Don't show the actor if the first item is actor-less (date alert)
     if (this.notification._links.actor) {
diff --git a/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts b/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts
index bf7cf86a5cd..0ef6d1b36e6 100644
--- a/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts
@@ -1,11 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IInAppNotificationDetailsAttribute, INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
@@ -20,6 +13,9 @@ import moment, { Moment } from 'moment';
   standalone: false,
 })
 export class InAppNotificationDateAlertComponent implements OnInit {
+  private I18n = inject(I18nService);
+  private timezoneService = inject(TimezoneService);
+
   @Input() aggregatedNotifications:INotification[];
 
   @HostBinding('class.op-ian-date-alert') className = true;
@@ -49,11 +45,6 @@ export class InAppNotificationDateAlertComponent implements OnInit {
     note: '', // date alerts do not have notes
   };
 
-  constructor(
-    private I18n:I18nService,
-    private timezoneService:TimezoneService,
-  ) { }
-
   ngOnInit():void {
     // Find the most important date alert
     const interestingAlert = this.deriveMostRelevantAlert(this.aggregatedNotifications);
diff --git a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts
index bf3b91a1cfd..57aae5371e8 100644
--- a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
@@ -23,6 +23,14 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
   standalone: false,
 })
 export class InAppNotificationEntryComponent extends UntilDestroyedMixin implements OnInit {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly I18n = inject(I18nService);
+  readonly storeService = inject(IanCenterService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly deviceService = inject(DeviceService);
+  readonly urlParams = inject(UrlParamsService);
+
   @HostBinding('class.op-ian-item') className = true;
 
   @Input() notification:INotification;
@@ -55,18 +63,6 @@ export class InAppNotificationEntryComponent extends UntilDestroyedMixin impleme
 
   workPackageId:string|null;
 
-  constructor(
-    readonly apiV3Service:ApiV3Service,
-    readonly I18n:I18nService,
-    readonly storeService:IanCenterService,
-    readonly timezoneService:TimezoneService,
-    readonly pathHelper:PathHelperService,
-    readonly deviceService:DeviceService,
-    readonly urlParams:UrlParamsService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     const href = this.notification._links.resource?.href;
     this.workPackageId = href && HalResource.matchFromLink(href, 'work_packages');
diff --git a/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts
index a2db83bca92..1c387e3113b 100644
--- a/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts
@@ -1,10 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
@@ -20,6 +14,9 @@ import { distinctUntilChanged, map } from 'rxjs/operators';
   standalone: false,
 })
 export class InAppNotificationRelativeTimeComponent implements OnInit {
+  private I18n = inject(I18nService);
+  private timezoneService = inject(TimezoneService);
+
   @Input() notification:INotification;
   @Input() hasActorByLine = true;
 
@@ -37,11 +34,6 @@ export class InAppNotificationRelativeTimeComponent implements OnInit {
     ),
   };
 
-  constructor(
-    private I18n:I18nService,
-    private timezoneService:TimezoneService,
-  ) { }
-
   ngOnInit():void {
     this.buildTime();
   }
diff --git a/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts
index 65e0354fa10..32bcd973b38 100644
--- a/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts
@@ -1,11 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IInAppNotificationDetailsResource, INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
 
@@ -18,6 +11,8 @@ import { IInAppNotificationDetailsResource, INotification } from 'core-app/core/
   standalone: false,
 })
 export class InAppNotificationReminderAlertComponent implements OnInit {
+  private I18n = inject(I18nService);
+
   @Input() aggregatedNotifications:INotification[];
 
   @HostBinding('class.op-ian-reminder-alert') className = true;
@@ -27,10 +22,6 @@ export class InAppNotificationReminderAlertComponent implements OnInit {
   hasDateAlert = false;
   dateAlerts:INotification[] = [];
 
-  constructor(
-    private I18n:I18nService,
-  ) { }
-
   ngOnInit():void {
     this.reminderAlert = this.deriveMostRecentReminder(this.aggregatedNotifications);
     this.reminderNote = this.extractReminderNoteValue(this.reminderAlert._embedded.details);
diff --git a/frontend/src/app/features/job-status/job-status-modal.service.ts b/frontend/src/app/features/job-status/job-status-modal.service.ts
index b5a22ac57b3..a3db171ad24 100644
--- a/frontend/src/app/features/job-status/job-status-modal.service.ts
+++ b/frontend/src/app/features/job-status/job-status-modal.service.ts
@@ -1,13 +1,12 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 
 @Injectable({ providedIn: 'root' })
 export class JobStatusModalService {
-  constructor(
-    protected pathHelper:PathHelperService,
-    protected turboRequests:TurboRequestsService,
-  ) {}
+  protected pathHelper = inject(PathHelperService);
+  protected turboRequests = inject(TurboRequestsService);
+
 
   public show(jobId:string):void {
     void this.turboRequests.requestStream(this.jobModalUrl(jobId));
diff --git a/frontend/src/app/features/plugins/openproject-plugins.module.ts b/frontend/src/app/features/plugins/openproject-plugins.module.ts
index 04c3ccbafef..f5ee7e0ffe4 100644
--- a/frontend/src/app/features/plugins/openproject-plugins.module.ts
+++ b/frontend/src/app/features/plugins/openproject-plugins.module.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { HookService } from 'core-app/features/plugins/hook-service';
 import { OpenProjectPluginContext } from 'core-app/features/plugins/plugin-context';
 import { debugLog } from 'core-app/shared/helpers/debug_output';
@@ -37,7 +37,9 @@ import { debugLog } from 'core-app/shared/helpers/debug_output';
   ],
 })
 export class OpenprojectPluginsModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     debugLog('Registering OpenProject plugin context');
     const pluginContext = new OpenProjectPluginContext(injector);
     window.OpenProject.pluginContext.putValue(pluginContext);
diff --git a/frontend/src/app/features/team-planner/team-planner/add-work-packages/add-existing-pane.component.ts b/frontend/src/app/features/team-planner/team-planner/add-work-packages/add-existing-pane.component.ts
index 6ef92b88a1b..9d7fee04bb6 100644
--- a/frontend/src/app/features/team-planner/team-planner/add-work-packages/add-existing-pane.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/add-work-packages/add-existing-pane.component.ts
@@ -1,12 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  HostBinding,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { imagePath } from 'core-app/shared/helpers/images/path-helper';
 import {
@@ -45,6 +37,17 @@ import { OpWorkPackagesCalendarService } from 'core-app/features/calendar/op-wor
   standalone: false,
 })
 export class AddExistingPaneComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  private readonly querySpace = inject(IsolatedQuerySpace);
+  private I18n = inject(I18nService);
+  private readonly apiV3Service = inject(ApiV3Service);
+  private readonly notificationService = inject(WorkPackageNotificationService);
+  private readonly currentProject = inject(CurrentProjectService);
+  private readonly urlParamsHelper = inject(UrlParamsHelperService);
+  private readonly workPackagesCalendar = inject(OpWorkPackagesCalendarService);
+  private readonly calendarDrag = inject(CalendarDragDropService);
+  private readonly actions$ = inject(ActionsService);
+  private readonly wpFilters = inject(WorkPackageViewFiltersService);
+
   @HostBinding('class.op-add-existing-pane') className = true;
 
   @ViewChild('container') container:ElementRef;
@@ -109,21 +112,6 @@ export class AddExistingPaneComponent extends UntilDestroyedMixin implements OnI
     empty_state: imagePath('team-planner/add-existing-pane--empty-state.gif'),
   };
 
-  constructor(
-    private readonly querySpace:IsolatedQuerySpace,
-    private I18n:I18nService,
-    private readonly apiV3Service:ApiV3Service,
-    private readonly notificationService:WorkPackageNotificationService,
-    private readonly currentProject:CurrentProjectService,
-    private readonly urlParamsHelper:UrlParamsHelperService,
-    private readonly workPackagesCalendar:OpWorkPackagesCalendarService,
-    private readonly calendarDrag:CalendarDragDropService,
-    private readonly actions$:ActionsService,
-    private readonly wpFilters:WorkPackageViewFiltersService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     combineLatest([
       this
diff --git a/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts b/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts
index 7bab1282a29..28f2c7a4343 100644
--- a/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Injector,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Injector, Input, Output, inject } from '@angular/core';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -54,24 +46,22 @@ import { WorkPackageViewFiltersService } from 'core-app/features/work-packages/r
   standalone: false,
 })
 export class AddAssigneeComponent {
+  protected elementRef = inject(ElementRef);
+  protected halResourceService = inject(HalResourceService);
+  protected I18n = inject(I18nService);
+  protected halNotification = inject(HalResourceNotificationService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly injector = inject(Injector);
+  readonly currentProjectService = inject(CurrentProjectService);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+
   @Output() public selectAssignee = new EventEmitter<HalResource>();
 
   @Input() alreadySelected:string[] = [];
 
   public getOptionsFn = (query:string):Observable<unknown[]> => this.autocomplete(query);
 
-  constructor(
-    protected elementRef:ElementRef,
-    protected halResourceService:HalResourceService,
-    protected I18n:I18nService,
-    protected halNotification:HalResourceNotificationService,
-    readonly pathHelper:PathHelperService,
-    readonly apiV3Service:ApiV3Service,
-    readonly injector:Injector,
-    readonly currentProjectService:CurrentProjectService,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-  ) { }
-
   public autocomplete(term:string|null):Observable<HalResource[]> {
     const filters = new ApiV3FilterBuilder();
 
diff --git a/frontend/src/app/features/team-planner/team-planner/calendar-drag-drop.service.ts b/frontend/src/app/features/team-planner/team-planner/calendar-drag-drop.service.ts
index 85586a4d20d..9a337c5efc5 100644
--- a/frontend/src/app/features/team-planner/team-planner/calendar-drag-drop.service.ts
+++ b/frontend/src/app/features/team-planner/team-planner/calendar-drag-drop.service.ts
@@ -1,7 +1,4 @@
-import {
-  ElementRef,
-  Injectable,
-} from '@angular/core';
+import { ElementRef, Injectable, inject } from '@angular/core';
 import { ThirdPartyDraggable } from '@fullcalendar/interaction';
 import { DragMetaInput } from '@fullcalendar/common';
 import dragula, { Drake } from 'dragula';
@@ -15,6 +12,11 @@ import moment from 'moment-timezone';
 
 @Injectable()
 export class CalendarDragDropService {
+  readonly authorisation = inject(AuthorisationService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly workPackagesCalendarService = inject(OpWorkPackagesCalendarService);
+  readonly I18n = inject(I18nService);
+
   drake:Drake;
 
   draggableWorkPackages$ = new BehaviorSubject<WorkPackageResource[]>([]);
@@ -28,14 +30,6 @@ export class CalendarDragDropService {
     },
   };
 
-  constructor(
-    readonly authorisation:AuthorisationService,
-    readonly schemaCache:SchemaCacheService,
-    readonly workPackagesCalendarService:OpWorkPackagesCalendarService,
-    readonly I18n:I18nService,
-  ) {
-  }
-
   destroyDrake():void {
     if (this.drake) {
       this.drake.destroy();
diff --git a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
index 569a70aac64..ccdad53dcb9 100644
--- a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
@@ -26,17 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  HostListener,
-  Injector,
-  OnDestroy,
-  OnInit,
-  TemplateRef,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, HostListener, Injector, OnDestroy, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
 import {
   CalendarOptions,
   DateSelectArg,
@@ -143,6 +133,27 @@ export type TeamPlannerViewOptions = Record<TeamPlannerViewOptionKey, RawOptions
   standalone: false,
 })
 export class TeamPlannerComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  private configuration = inject(ConfigurationService);
+  private principalsResourceService = inject(PrincipalsResourceService);
+  private capabilitiesResourceService = inject(CapabilitiesResourceService);
+  private wpTableFilters = inject(WorkPackageViewFiltersService);
+  private querySpace = inject(IsolatedQuerySpace);
+  private currentProject = inject(CurrentProjectService);
+  private I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly calendar = inject(OpCalendarService);
+  readonly workPackagesCalendar = inject(OpWorkPackagesCalendarService);
+  readonly halEditing = inject(HalResourceEditingService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly calendarDrag = inject(CalendarDragDropService);
+  readonly actions$ = inject(ActionsService);
+  readonly toastService = inject(ToastService);
+  readonly loadingIndicatorService = inject(LoadingIndicatorService);
+  readonly weekdayService = inject(WeekdayService);
+  readonly deviceService = inject(DeviceService);
+
   @ViewChild(FullCalendarComponent) ucCalendar:FullCalendarComponent;
 
   @ViewChild('ucCalendar', { read: ElementRef })
@@ -403,31 +414,6 @@ export class TeamPlannerComponent extends UntilDestroyedMixin implements OnInit,
     },
   };
 
-  constructor(
-    private configuration:ConfigurationService,
-    private principalsResourceService:PrincipalsResourceService,
-    private capabilitiesResourceService:CapabilitiesResourceService,
-    private wpTableFilters:WorkPackageViewFiltersService,
-    private querySpace:IsolatedQuerySpace,
-    private currentProject:CurrentProjectService,
-    private I18n:I18nService,
-    readonly injector:Injector,
-    readonly calendar:OpCalendarService,
-    readonly workPackagesCalendar:OpWorkPackagesCalendarService,
-    readonly halEditing:HalResourceEditingService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly schemaCache:SchemaCacheService,
-    readonly apiV3Service:ApiV3Service,
-    readonly calendarDrag:CalendarDragDropService,
-    readonly actions$:ActionsService,
-    readonly toastService:ToastService,
-    readonly loadingIndicatorService:LoadingIndicatorService,
-    readonly weekdayService:WeekdayService,
-    readonly deviceService:DeviceService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     registerEffectCallbacks(this, this.untilDestroyed());
     this.initializeCalendar();
diff --git a/frontend/src/app/features/team-planner/team-planner/team-planner-entry.component.ts b/frontend/src/app/features/team-planner/team-planner/team-planner-entry.component.ts
index 639ef01f5b0..04c1d5c9f20 100644
--- a/frontend/src/app/features/team-planner/team-planner/team-planner-entry.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/team-planner-entry.component.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  OnDestroy,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, OnDestroy, inject } from '@angular/core';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
@@ -16,7 +11,9 @@ import {
   standalone: false,
 })
 export class TeamPlannerEntryComponent implements OnDestroy {
-  constructor(readonly elementRef:ElementRef) {
+  readonly elementRef = inject(ElementRef);
+
+  constructor() {
     populateInputsFromDataset(this);
     document.body.classList.add('router--team-planner');
   }
diff --git a/frontend/src/app/features/user-preferences/state/user-preferences.service.ts b/frontend/src/app/features/user-preferences/state/user-preferences.service.ts
index 8e624a078fc..a8b60103376 100644
--- a/frontend/src/app/features/user-preferences/state/user-preferences.service.ts
+++ b/frontend/src/app/features/user-preferences/state/user-preferences.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { ApiV3UserPreferencesPaths } from 'core-app/core/apiv3/endpoints/users/apiv3-user-preferences-paths';
@@ -9,17 +9,14 @@ import { UserPreferencesQuery } from 'core-app/features/user-preferences/state/u
 
 @Injectable({ providedIn: 'root' })
 export class UserPreferencesService {
+  private apiV3Service = inject(ApiV3Service);
+  private toastService = inject(ToastService);
+  private I18n = inject(I18nService);
+
   readonly store = new UserPreferencesStore();
 
   readonly query = new UserPreferencesQuery(this.store);
 
-  constructor(
-    private apiV3Service:ApiV3Service,
-    private toastService:ToastService,
-    private I18n:I18nService,
-  ) {
-  }
-
   get(user:string):void {
     this.store.setLoading(true);
     this.preferenceAPI(user)
diff --git a/frontend/src/app/features/work-packages/components/back-routing/back-button.component.ts b/frontend/src/app/features/work-packages/components/back-routing/back-button.component.ts
index 8cda6114a8c..acfcf021501 100644
--- a/frontend/src/app/features/work-packages/components/back-routing/back-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/back-routing/back-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { BackRoutingService } from 'core-app/features/work-packages/components/back-routing/back-routing.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -38,18 +38,15 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   standalone: false,
 })
 export class BackButtonComponent {
+  readonly backRoutingService = inject(BackRoutingService);
+  readonly I18n = inject(I18nService);
+
   @Input() public linkClass:string;
 
   public text = {
     goBack: this.I18n.t('js.button_back'),
   };
 
-  constructor(
-    readonly backRoutingService:BackRoutingService,
-    readonly I18n:I18nService,
-  ) {
-  }
-
   public goBack():void {
     this.backRoutingService.goBack();
   }
diff --git a/frontend/src/app/features/work-packages/components/back-routing/back-routing.service.ts b/frontend/src/app/features/work-packages/components/back-routing/back-routing.service.ts
index 83029aadd84..c8acbe2c18a 100644
--- a/frontend/src/app/features/work-packages/components/back-routing/back-routing.service.ts
+++ b/frontend/src/app/features/work-packages/components/back-routing/back-routing.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { StateService, Transition } from '@uirouter/core';
 import { KeepTabService } from 'core-app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
@@ -40,15 +40,14 @@ export interface BackRouteOptions {
 
 @Injectable({ providedIn: 'root' })
 export class BackRoutingService {
+  readonly injector = inject(Injector);
+
   @InjectField() private $state:StateService;
 
   @InjectField() private keepTab:KeepTabService;
 
   private _backRoute:BackRouteOptions;
 
-  constructor(readonly injector:Injector) {
-  }
-
   private goToOtherState(route:string, params:Record<string, unknown>):Promise<unknown> {
     return this.$state.go(route, params);
   }
diff --git a/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.component.ts b/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.component.ts
index 17ab41212f4..65d3e74def5 100644
--- a/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.component.ts
+++ b/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-form/edit-form.component';
 
@@ -39,6 +37,10 @@ import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-f
   standalone: false,
 })
 export class WorkPackageEditActionsBarComponent {
+  private I18n = inject(I18nService);
+  private editForm = inject(EditFormComponent);
+  private cdRef = inject(ChangeDetectorRef);
+
   @Output() public onSave = new EventEmitter<void>();
 
   @Output() public onCancel = new EventEmitter<void>();
@@ -50,11 +52,6 @@ export class WorkPackageEditActionsBarComponent {
     cancel: this.I18n.t('js.button_cancel'),
   };
 
-  constructor(private I18n:I18nService,
-    private editForm:EditFormComponent,
-    private cdRef:ChangeDetectorRef) {
-  }
-
   public set saving(active:boolean) {
     this._saving = active;
     this.cdRef.detectChanges();
diff --git a/frontend/src/app/features/work-packages/components/filters/abstract-filter-date-time-value/abstract-filter-date-time-value.controller.ts b/frontend/src/app/features/work-packages/components/filters/abstract-filter-date-time-value/abstract-filter-date-time-value.controller.ts
index 6b16d361750..088992948d9 100644
--- a/frontend/src/app/features/work-packages/components/filters/abstract-filter-date-time-value/abstract-filter-date-time-value.controller.ts
+++ b/frontend/src/app/features/work-packages/components/filters/abstract-filter-date-time-value/abstract-filter-date-time-value.controller.ts
@@ -28,21 +28,17 @@
 
 import { Moment } from 'moment';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { OnInit, Directive } from '@angular/core';
+import { OnInit, Directive, inject } from '@angular/core';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
 
 @Directive()
 export abstract class AbstractDateTimeValueController extends UntilDestroyedMixin implements OnInit {
-  public filter:QueryFilterInstanceResource;
+  protected I18n = inject(I18nService);
+  protected timezoneService = inject(TimezoneService);
 
-  constructor(
-    protected I18n:I18nService,
-    protected timezoneService:TimezoneService,
-  ) {
-    super();
-  }
+  public filter:QueryFilterInstanceResource;
 
   ngOnInit() {
     this.filter.values = (this.filter.values as string[]).filter((value) => (value === '' || this.timezoneService.isValidISODateTime(value)));
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-boolean-value/filter-boolean-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-boolean-value/filter-boolean-value.component.ts
index 4d1319a13f7..0954036bbd3 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-boolean-value/filter-boolean-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-boolean-value/filter-boolean-value.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Component, EventEmitter, Input, Output, ChangeDetectionStrategy } from '@angular/core';
+import { Component, EventEmitter, Input, Output, ChangeDetectionStrategy, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
@@ -38,15 +38,14 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
   standalone: false,
 })
 export class FilterBooleanValueComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() public shouldFocus = false;
 
   @Input() public filter:QueryFilterInstanceResource;
 
   @Output() public filterChanged = new EventEmitter<QueryFilterInstanceResource>();
 
-  constructor(readonly I18n:I18nService) {
-  }
-
   public get value():HalResource | string {
     // Boolean fields should be initialized as true by default
     if (this.filter.values.length === 0) {
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-container/filter-container.directive.ts b/frontend/src/app/features/work-packages/components/filters/filter-container/filter-container.directive.ts
index 412cafc0393..66b62172957 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-container/filter-container.directive.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-container/filter-container.directive.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, Output, inject } from '@angular/core';
 import {
   WorkPackageViewFiltersService,
 } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
@@ -55,6 +47,11 @@ import { WorkPackagesListService } from 'core-app/features/work-packages/compone
   standalone: false,
 })
 export class WorkPackageFilterContainerComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly wpFiltersService = inject(WorkPackageFiltersService);
+  readonly wpListService = inject(WorkPackagesListService);
+
   @Input() showFilterButton = false;
 
   @Input() filterButtonText:string = I18n.t('js.button_filter');
@@ -67,12 +64,7 @@ export class WorkPackageFilterContainerComponent extends UntilDestroyedMixin imp
 
   public loaded = false;
 
-  constructor(
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly wpFiltersService:WorkPackageFiltersService,
-    readonly wpListService:WorkPackagesListService,
-  ) {
+  constructor() {
     super();
     this.visible$ = this.wpFiltersService.observeUntil(componentDestroyed(this));
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-date-time-value/filter-date-time-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-date-time-value/filter-date-time-value.component.ts
index feec49ccfae..f249c5a0aad 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-date-time-value/filter-date-time-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-date-time-value/filter-date-time-value.component.ts
@@ -26,20 +26,11 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  HostBinding,
-  OnInit,
-  Output,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ChangeDetectionStrategy, Component, Input, HostBinding, OnInit, Output } from '@angular/core';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
 import { Moment } from 'moment';
 import { componentDestroyed } from '@w11k/ngx-componentdestroyed';
-import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
 import { AbstractDateTimeValueController } from '../abstract-filter-date-time-value/abstract-filter-date-time-value.controller';
 
@@ -65,11 +56,6 @@ export class FilterDateTimeValueComponent extends AbstractDateTimeValueControlle
 
   @Output() public filterChanged = new DebouncedEventEmitter<QueryFilterInstanceResource>(componentDestroyed(this));
 
-  constructor(readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService) {
-    super(I18n, timezoneService);
-  }
-
   public get value():HalResource|string {
     return this.filter.values[0];
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-date-times-value/filter-date-times-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-date-times-value/filter-date-times-value.component.ts
index dcc3fccaf18..fb175587fef 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-date-times-value/filter-date-times-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-date-times-value/filter-date-times-value.component.ts
@@ -27,18 +27,9 @@
 //++
 
 import { Moment } from 'moment';
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-  OnInit,
-  Output,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, Output } from '@angular/core';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
 import { componentDestroyed } from '@w11k/ngx-componentdestroyed';
-import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
 import { AbstractDateTimeValueController } from '../abstract-filter-date-time-value/abstract-filter-date-time-value.controller';
 import { validDate } from 'core-app/shared/components/datepicker/helpers/date-modal.helpers';
@@ -69,13 +60,6 @@ export class FilterDateTimesValueComponent extends AbstractDateTimeValueControll
     spacer: this.I18n.t('js.filter.value_spacer'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService,
-  ) {
-    super(I18n, timezoneService);
-  }
-
   public get begin():string {
     return (this.filter.values[0] || '') as string;
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-date-value/filter-date-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-date-value/filter-date-value.component.ts
index b3fc174bdf4..ddc6e34ef13 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-date-value/filter-date-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-date-value/filter-date-value.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -51,6 +45,9 @@ import moment from 'moment-timezone';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class FilterDateValueComponent extends UntilDestroyedMixin {
+  readonly timezoneService = inject(TimezoneService);
+  readonly I18n = inject(I18nService);
+
   @HostBinding('id') get id() {
     return `div-values-${this.filter.id}`;
   }
@@ -61,11 +58,6 @@ export class FilterDateValueComponent extends UntilDestroyedMixin {
 
   @Output() public filterChanged = new DebouncedEventEmitter<QueryFilterInstanceResource>(componentDestroyed(this));
 
-  constructor(readonly timezoneService:TimezoneService,
-    readonly I18n:I18nService) {
-    super();
-  }
-
   public get value():string {
     return this.filter.values[0] as string;
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-dates-value/filter-dates-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-dates-value/filter-dates-value.component.ts
index 2812c33b302..3286d1e3465 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-dates-value/filter-dates-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-dates-value/filter-dates-value.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
 import moment from 'moment';
@@ -51,6 +45,9 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class FilterDatesValueComponent extends UntilDestroyedMixin {
+  readonly timezoneService = inject(TimezoneService);
+  readonly I18n = inject(I18nService);
+
   @HostBinding('id') get id() {
     return `div-values-${this.filter.id}`;
   }
@@ -67,13 +64,6 @@ export class FilterDatesValueComponent extends UntilDestroyedMixin {
     spacer: this.I18n.t('js.filter.value_spacer'),
   };
 
-  constructor(
-    readonly timezoneService:TimezoneService,
-    readonly I18n:I18nService,
-  ) {
-    super();
-  }
-
   public get value():string[] {
     return (this.filter.values || []) as string[];
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-integer-value/filter-integer-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-integer-value/filter-integer-value.component.ts
index 2002cde4d30..9a7c9b7828d 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-integer-value/filter-integer-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-integer-value/filter-integer-value.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -45,17 +45,15 @@ import { QueryFilterResource } from 'core-app/features/hal/resources/query-filte
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class FilterIntegerValueComponent extends UntilDestroyedMixin {
+  readonly I18n = inject(I18nService);
+  readonly schemaCache = inject(SchemaCacheService);
+
   @Input() public shouldFocus = false;
 
   @Input() public filter:QueryFilterInstanceResource;
 
   @Output() public filterChanged = new DebouncedEventEmitter<QueryFilterInstanceResource>(componentDestroyed(this));
 
-  constructor(readonly I18n:I18nService,
-    readonly schemaCache:SchemaCacheService) {
-    super();
-  }
-
   public get value() {
     return parseInt(this.filter.values[0] as string);
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-project/filter-project.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-project/filter-project.component.ts
index 19043245cfa..c0ea251b2cb 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-project/filter-project.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-project/filter-project.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
@@ -48,6 +48,10 @@ import { IAPIFilter } from 'core-app/shared/components/autocompleter/op-autocomp
   standalone: false,
 })
 export class FilterProjectComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly currentProjectService = inject(CurrentProjectService);
+
   @Input() public shouldFocus = false;
 
   @Input() public filter:QueryFilterInstanceResource;
@@ -56,14 +60,6 @@ export class FilterProjectComponent extends UntilDestroyedMixin implements OnIni
 
   additionalProjectApiFilters:IAPIFilter[] = [];
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly currentProjectService:CurrentProjectService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     const projectID = this.currentProjectService.id;
 
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-searchable-multiselect-value/filter-searchable-multiselect-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-searchable-multiselect-value/filter-searchable-multiselect-value.component.ts
index 2aea22095fe..de1a795993a 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-searchable-multiselect-value/filter-searchable-multiselect-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-searchable-multiselect-value/filter-searchable-multiselect-value.component.ts
@@ -10,16 +10,7 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 import { take } from 'rxjs/internal/operators/take';
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, inject } from '@angular/core';
 
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { ApiV3FilterBuilder } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder';
@@ -44,6 +35,14 @@ import { MAGIC_FILTER_AUTOCOMPLETE_PAGE_SIZE } from 'core-app/core/apiv3/helpers
   standalone: false,
 })
 export class FilterSearchableMultiselectValueComponent extends UntilDestroyedMixin implements OnInit {
+  readonly halResourceService = inject(HalResourceService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly I18n = inject(I18nService);
+  protected currentProject = inject(CurrentProjectService);
+  protected currentUser = inject(CurrentUserService);
+  readonly halNotification = inject(HalResourceNotificationService);
+
   @Input() public filter:QueryFilterInstanceResource;
 
   @Input() public shouldFocus = false;
@@ -85,18 +84,6 @@ export class FilterSearchableMultiselectValueComponent extends UntilDestroyedMix
 
   @ViewChild('ngSelectInstance', { static: true }) ngSelectInstance:NgSelectComponent;
 
-  constructor(
-    readonly halResourceService:HalResourceService,
-    readonly apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-    protected currentProject:CurrentProjectService,
-    protected currentUser:CurrentUserService,
-    readonly halNotification:HalResourceNotificationService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     if (this.filter.id === 'id') {
       this.resourceType = 'work_packages';
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-string-value/filter-string-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-string-value/filter-string-value.component.ts
index 64b35623ffe..d8b6622b496 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-string-value/filter-string-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-string-value/filter-string-value.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
@@ -44,6 +44,8 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class FilterStringValueComponent extends UntilDestroyedMixin {
+  readonly I18n = inject(I18nService);
+
   @Input() public shouldFocus = false;
 
   @Input() public filter:QueryFilterInstanceResource;
@@ -54,10 +56,6 @@ export class FilterStringValueComponent extends UntilDestroyedMixin {
     enter_text: this.I18n.t('js.work_packages.description_enter_text'),
   };
 
-  constructor(readonly I18n:I18nService) {
-    super();
-  }
-
   public get value():HalResource|string {
     return this.filter.values[0];
   }
diff --git a/frontend/src/app/features/work-packages/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.ts b/frontend/src/app/features/work-packages/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.ts
index 0f0ab32b317..7626c72b92d 100644
--- a/frontend/src/app/features/work-packages/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.ts
@@ -27,17 +27,7 @@
 //++
 
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResourceSortingService } from 'core-app/features/hal/services/hal-resource-sorting.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -55,6 +45,14 @@ import { compareByHref } from 'core-app/shared/helpers/angular/tracking-function
   standalone: false,
 })
 export class FilterToggledMultiselectValueComponent implements OnInit, AfterViewInit {
+  readonly halResourceService = inject(HalResourceService);
+  readonly halSorting = inject(HalResourceSortingService);
+  readonly PathHelper = inject(PathHelperService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly currentUser = inject(CurrentUserService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly I18n = inject(I18nService);
+
   @Input() public shouldFocus = false;
 
   @Input() public filter:QueryFilterInstanceResource;
@@ -73,17 +71,6 @@ export class FilterToggledMultiselectValueComponent implements OnInit, AfterView
     placeholder: this.I18n.t('js.placeholders.selection'),
   };
 
-  constructor(
-    readonly halResourceService:HalResourceService,
-    readonly halSorting:HalResourceSortingService,
-    readonly PathHelper:PathHelperService,
-    readonly apiV3Service:ApiV3Service,
-    readonly currentUser:CurrentUserService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-  ) {
-  }
-
   ngOnInit():void {
     const values = (this.filter.currentSchema!.values!.allowedValues as HalResource[]);
     this.availableOptions = this.halSorting.sort(values);
diff --git a/frontend/src/app/features/work-packages/components/filters/query-filter/query-filter.component.ts b/frontend/src/app/features/work-packages/components/filters/query-filter/query-filter.component.ts
index 2a3bba8124a..aa0455a1a9c 100644
--- a/frontend/src/app/features/work-packages/components/filters/query-filter/query-filter.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/query-filter/query-filter.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  HostBinding,
-  Input,
-  OnInit,
-  Output,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, HostBinding, Input, OnInit, Output, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   compareByHref,
@@ -61,6 +52,12 @@ import { WorkPackageViewBaselineService } from 'core-app/features/work-packages/
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class QueryFilterComponent implements OnInit {
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpTableBaseline = inject(WorkPackageViewBaselineService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly I18n = inject(I18nService);
+  readonly currentProject = inject(CurrentProjectService);
+
   @HostBinding('class.op-query-filter') className = true;
 
   @Input() public shouldFocus = false;
@@ -91,15 +88,6 @@ export class QueryFilterComponent implements OnInit {
     incompatible_filter: this.I18n.t('js.work_packages.filters.baseline_incompatible'),
   };
 
-  constructor(
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpTableBaseline:WorkPackageViewBaselineService,
-    readonly schemaCache:SchemaCacheService,
-    readonly I18n:I18nService,
-    readonly currentProject:CurrentProjectService,
-  ) {
-  }
-
   public onFilterUpdated(filter:QueryFilterInstanceResource) {
     this.filter = filter;
     this.showValuesInput = this.showValues();
diff --git a/frontend/src/app/features/work-packages/components/filters/query-filters/query-filters.component.ts b/frontend/src/app/features/work-packages/components/filters/query-filters/query-filters.component.ts
index 2321aadd3d1..dfe92d1313d 100644
--- a/frontend/src/app/features/work-packages/components/filters/query-filters/query-filters.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/query-filters/query-filters.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-  OnChanges,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnInit, Output, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { DebouncedEventEmitter } from 'core-app/shared/helpers/rxjs/debounced-event-emitter';
 import { NgSelectComponent } from '@ng-select/ng-select';
@@ -59,6 +50,13 @@ const ADD_FILTER_SELECT_INDEX = -1;
   standalone: false,
 })
 export class QueryFiltersComponent extends UntilDestroyedMixin implements OnInit, OnChanges {
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpTableBaseline = inject(WorkPackageViewBaselineService);
+  readonly wpFiltersService = inject(WorkPackageFiltersService);
+  readonly I18n = inject(I18nService);
+  readonly alternativeSearchService = inject(AlternativeSearchService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @ViewChild(NgSelectComponent) public ngSelectComponent:NgSelectComponent;
 
   @Input() public filters:QueryFilterInstanceResource[];
@@ -88,17 +86,6 @@ export class QueryFiltersComponent extends UntilDestroyedMixin implements OnInit
     baseline_warning: this.I18n.t('js.work_packages.filters.baseline_warning'),
   };
 
-  constructor(
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpTableBaseline:WorkPackageViewBaselineService,
-    readonly wpFiltersService:WorkPackageFiltersService,
-    readonly I18n:I18nService,
-    readonly alternativeSearchService:AlternativeSearchService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     this.wpTableFilters.live$()
       .pipe(
diff --git a/frontend/src/app/features/work-packages/components/filters/quick-filter-by-text-input/quick-filter-by-text-input.component.ts b/frontend/src/app/features/work-packages/components/filters/quick-filter-by-text-input/quick-filter-by-text-input.component.ts
index 6052eecc646..b1ed134ffe3 100644
--- a/frontend/src/app/features/work-packages/components/filters/quick-filter-by-text-input/quick-filter-by-text-input.component.ts
+++ b/frontend/src/app/features/work-packages/components/filters/quick-filter-by-text-input/quick-filter-by-text-input.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewFiltersService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
 import { Subject } from 'rxjs';
@@ -48,6 +48,10 @@ import { QueryFilterResource } from 'core-app/features/hal/resources/query-filte
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageFilterByTextInputComponent extends UntilDestroyedMixin {
+  readonly I18n = inject(I18nService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+
   @Output() public deactivateFilter = new EventEmitter<QueryFilterResource>();
 
   public text = {
@@ -63,9 +67,7 @@ export class WorkPackageFilterByTextInputComponent extends UntilDestroyedMixin {
   /** Input for search requests */
   public searchTermChanged:Subject<string> = new Subject<string>();
 
-  constructor(readonly I18n:I18nService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpTableFilters:WorkPackageViewFiltersService) {
+  constructor() {
     super();
 
     this.wpTableFilters
diff --git a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts
index ce265bc3dfb..ddcfd00a104 100644
--- a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  HostBinding,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewBaselineService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-baseline.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
@@ -61,6 +54,14 @@ import { filter } from 'rxjs/operators';
   standalone: false,
 })
 export class OpBaselineLegendsComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly wpTableBaseline = inject(WorkPackageViewBaselineService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly configuration = inject(ConfigurationService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @HostBinding('class.op-baseline-legends') className = true;
 
   public numAdded = 0;
@@ -86,18 +87,6 @@ export class OpBaselineLegendsComponent extends UntilDestroyedMixin implements O
     in_your_timezone: this.I18n.t('js.baseline.legends.in_your_timezone'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly wpTableBaseline:WorkPackageViewBaselineService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly schemaCache:SchemaCacheService,
-    readonly timezoneService:TimezoneService,
-    readonly configuration:ConfigurationService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this
       .wpTableBaseline
diff --git a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-modal/baseline-modal.component.ts b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-modal/baseline-modal.component.ts
index 6616f8a55e6..c04ea13a584 100644
--- a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-modal/baseline-modal.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-modal/baseline-modal.component.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 @Component({
@@ -40,6 +36,8 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   standalone: false,
 })
 export class OpBaselineModalComponent {
+  readonly I18n = inject(I18nService);
+
   @HostBinding('class.op-baseline-modal') className = true;
 
   public opened = false;
@@ -52,10 +50,6 @@ export class OpBaselineModalComponent {
 
   };
 
-  constructor(
-    readonly I18n:I18nService,
-  ) {}
-
   public toggleOpen():void {
     this.opened = !this.opened;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-baseline/baseline/baseline.component.ts b/frontend/src/app/features/work-packages/components/wp-baseline/baseline/baseline.component.ts
index cf9130613a6..faae4c000ef 100644
--- a/frontend/src/app/features/work-packages/components/wp-baseline/baseline/baseline.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-baseline/baseline/baseline.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  HostBinding,
-  Input,
-  OnInit,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, HostBinding, Input, OnInit, Output, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -71,6 +63,15 @@ const DEFAULT_SELECTED_TIME = '08:00';
   standalone: false,
 })
 export class OpBaselineComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly wpTableBaseline = inject(WorkPackageViewBaselineService);
+  readonly halResourceService = inject(HalResourceService);
+  readonly weekdaysService = inject(WeekdayService);
+  readonly daysService = inject(DayResourceService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly configuration = inject(ConfigurationService);
+  readonly Banner = inject(BannersService);
+
   @HostBinding('class.op-baseline') className = true;
 
   @Output() submitted = new EventEmitter<void>();
@@ -162,19 +163,6 @@ export class OpBaselineComponent extends UntilDestroyedMixin implements OnInit {
     },
   ];
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly wpTableBaseline:WorkPackageViewBaselineService,
-    readonly halResourceService:HalResourceService,
-    readonly weekdaysService:WeekdayService,
-    readonly daysService:DayResourceService,
-    readonly timezoneService:TimezoneService,
-    readonly configuration:ConfigurationService,
-    readonly Banner:BannersService,
-  ) {
-    super();
-  }
-
   public ngOnInit():void {
     this.userTimezone = this.timezoneService.userTimezone();
     this.userOffset = moment().tz(this.userTimezone).format('Z');
diff --git a/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb-parent.component.ts b/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb-parent.component.ts
index ac29f91b335..c164626783a 100644
--- a/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb-parent.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb-parent.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { WorkPackageRelationsHierarchyService } from 'core-app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -49,6 +43,11 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageBreadcrumbParentComponent {
+  protected readonly I18n = inject(I18nService);
+  protected readonly wpRelationsHierarchy = inject(WorkPackageRelationsHierarchyService);
+  protected readonly notificationService = inject(WorkPackageNotificationService);
+  protected readonly pathHelper = inject(PathHelperService);
+
   @Input() workPackage:WorkPackageResource;
 
   @Output() onSwitch = new EventEmitter<boolean>();
@@ -64,14 +63,6 @@ export class WorkPackageBreadcrumbParentComponent {
 
   private editing:boolean;
 
-  public constructor(
-    protected readonly I18n:I18nService,
-    protected readonly wpRelationsHierarchy:WorkPackageRelationsHierarchyService,
-    protected readonly notificationService:WorkPackageNotificationService,
-    protected readonly pathHelper:PathHelperService,
-  ) {
-  }
-
   public canModifyParent():boolean {
     return !!this.workPackage.changeParent;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb.component.ts b/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb.component.ts
index 8f0662c6bb2..89f007dcd95 100644
--- a/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-breadcrumb/wp-breadcrumb.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -42,6 +42,9 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageBreadcrumbComponent {
+  private I18n = inject(I18nService);
+  private pathHelper = inject(PathHelperService);
+
   @Input() workPackage:WorkPackageResource;
 
   public text = {
@@ -49,11 +52,6 @@ export class WorkPackageBreadcrumbComponent {
     hierarchy: this.I18n.t('js.relations_hierarchy.hierarchy_headline'),
   };
 
-  constructor(
-    private I18n:I18nService,
-    private pathHelper:PathHelperService,
-  ) {}
-
   public inputActive = false;
 
   public get hierarchyCount() {
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.component.ts
index 2bca877a7fd..85d6e0eaa1f 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.component.ts
@@ -27,7 +27,7 @@
 //++
 
 import { StateService, TransitionService } from '@uirouter/core';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import { Observable } from 'rxjs';
@@ -43,6 +43,14 @@ import { CurrentUserService } from 'core-app/core/current-user/current-user.serv
   standalone: false,
 })
 export class WorkPackageCreateButtonComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  readonly $state = inject(StateService);
+  readonly currentUser = inject(CurrentUserService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly authorisationService = inject(AuthorisationService);
+  readonly transition = inject(TransitionService);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() stateName$:Observable<string>;
 
   @Input() routedFromAngular = true;
@@ -64,18 +72,6 @@ export class WorkPackageCreateButtonComponent extends UntilDestroyedMixin implem
     explanation: this.I18n.t('js.label_create_work_package'),
   };
 
-  constructor(
-    readonly $state:StateService,
-    readonly currentUser:CurrentUserService,
-    readonly currentProject:CurrentProjectService,
-    readonly authorisationService:AuthorisationService,
-    readonly transition:TransitionService,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this.projectIdentifier = this.currentProject.identifier;
 
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-details-view-button/wp-details-view-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-details-view-button/wp-details-view-button.component.ts
index 50462a62384..94b6a73d354 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-details-view-button/wp-details-view-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-details-view-button/wp-details-view-button.component.ts
@@ -28,9 +28,7 @@
 
 import { WorkPackageViewFocusService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-focus.service';
 import { StateService, TransitionService } from '@uirouter/core';
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, inject } from '@angular/core';
 import { AbstractWorkPackageButtonComponent } from 'core-app/features/work-packages/components/wp-buttons/wp-buttons.module';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { States } from 'core-app/core/states/states.service';
@@ -44,6 +42,14 @@ import { resolveRoutingId } from 'core-app/features/work-packages/helpers/work-p
   standalone: false,
 })
 export class WorkPackageDetailsViewButtonComponent extends AbstractWorkPackageButtonComponent implements OnDestroy {
+  readonly $state = inject(StateService);
+  readonly I18n:I18nService;
+  readonly transitions = inject(TransitionService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  states = inject(States);
+  wpTableFocus = inject(WorkPackageViewFocusService);
+  keepTab = inject(KeepTabService);
+
   public projectIdentifier:string;
 
   public accessKey = 8;
@@ -64,16 +70,12 @@ export class WorkPackageDetailsViewButtonComponent extends AbstractWorkPackageBu
 
   private transitionListener:Function;
 
-  constructor(
-    readonly $state:StateService,
-    readonly I18n:I18nService,
-    readonly transitions:TransitionService,
-    readonly cdRef:ChangeDetectorRef,
-    public states:States,
-    public wpTableFocus:WorkPackageViewFocusService,
-    public keepTab:KeepTabService,
-  ) {
+  constructor() {
+    const I18n = inject(I18nService);
+
     super(I18n);
+    this.I18n = I18n;
+
 
     this.activateLabel = I18n.t('js.button_open_details');
     this.deactivateLabel = I18n.t('js.button_close_details');
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-filter-button/wp-filter-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-filter-button/wp-filter-button.component.ts
index 825f91f93e6..a8e2d62ab58 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-filter-button/wp-filter-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-filter-button/wp-filter-button.component.ts
@@ -28,9 +28,7 @@
 
 import { AbstractWorkPackageButtonComponent } from 'core-app/features/work-packages/components/wp-buttons/wp-buttons.module';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
 import { WorkPackageViewFiltersService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
 import { componentDestroyed } from '@w11k/ngx-componentdestroyed';
 import { WorkPackageFiltersService } from 'core-app/features/work-packages/components/filters/wp-filters/wp-filters.service';
@@ -42,6 +40,11 @@ import { WorkPackageFiltersService } from 'core-app/features/work-packages/compo
   standalone: false,
 })
 export class WorkPackageFilterButtonComponent extends AbstractWorkPackageButtonComponent implements OnInit {
+  readonly I18n:I18nService;
+  protected cdRef = inject(ChangeDetectorRef);
+  protected wpFiltersService = inject(WorkPackageFiltersService);
+  protected wpTableFilters = inject(WorkPackageViewFiltersService);
+
   public count:number;
 
   public initialized = false;
@@ -52,13 +55,12 @@ export class WorkPackageFilterButtonComponent extends AbstractWorkPackageButtonC
 
   public title = this.I18n.t('js.work_packages.filters.title');
 
-  constructor(
-    readonly I18n:I18nService,
-    protected cdRef:ChangeDetectorRef,
-    protected wpFiltersService:WorkPackageFiltersService,
-    protected wpTableFilters:WorkPackageViewFiltersService,
-  ) {
+  constructor() {
+    const I18n = inject(I18nService);
+
     super(I18n);
+
+    this.I18n = I18n;
   }
 
   ngOnInit():void {
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-mark-notification-button/work-package-mark-notification-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-mark-notification-button/work-package-mark-notification-button.component.ts
index b174a20c9b1..25a77f50368 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-mark-notification-button/work-package-mark-notification-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-mark-notification-button/work-package-mark-notification-button.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { WpSingleViewService } from 'core-app/features/work-packages/routing/wp-view-base/state/wp-single-view.service';
@@ -10,18 +10,15 @@ import { WpSingleViewService } from 'core-app/features/work-packages/routing/wp-
   standalone: false,
 })
 export class WorkPackageMarkNotificationButtonComponent {
+  private I18n = inject(I18nService);
+  private storeService = inject(WpSingleViewService);
+
   @Input() public workPackage:WorkPackageResource;
 
   text = {
     mark_as_read: this.I18n.t('js.notifications.center.mark_as_read'),
   };
 
-  constructor(
-    private I18n:I18nService,
-    private storeService:WpSingleViewService,
-  ) {
-  }
-
   markAllBelongingNotificationsAsRead():void {
     this.storeService.markAllAsRead();
     // emit custom event in order to inform the activity tab stimulus controller
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts
index 4dd6608d0c0..135a9547544 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ActionsService } from 'core-app/core/state/actions/actions.service';
@@ -51,23 +51,19 @@ import { filter, map, startWith, switchMap } from 'rxjs/operators';
   standalone: false,
 })
 export class WorkPackageReminderButtonComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly opModalService = inject(OpModalService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly actions$ = inject(ActionsService);
+  readonly storeService = inject(IanBellService);
+
   @Input() public workPackage:WorkPackageResource;
 
   hasReminder$:Observable<boolean>;
 
   public buttonTitle = this.I18n.t('js.work_packages.reminders.button_label');
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly opModalService:OpModalService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly apiV3Service:ApiV3Service,
-    readonly actions$:ActionsService,
-    readonly storeService:IanBellService,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     const reminderModalUpdated$ = this
       .actions$
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-context-menu.directive.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-context-menu.directive.ts
index 75b06874064..88097ce5b08 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-context-menu.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-context-menu.directive.ts
@@ -1,5 +1,4 @@
-import { Directive, ElementRef, Input, OnInit } from '@angular/core';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
+import { Directive, Input, OnInit, inject } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -14,20 +13,14 @@ import { ReminderPreset, REMINDER_PRESET_OPTIONS } from 'core-app/features/work-
   standalone: false,
 })
 export class WorkPackageReminderContextMenuDirective extends OpContextMenuTrigger implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly opModalService = inject(OpModalService);
+
   // eslint-disable-next-line @angular-eslint/no-input-rename
   @Input('wpReminderContextMenu-workPackage') workPackage:WorkPackageResource;
 
   protected items:OpContextMenuItem[] = [];
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly I18n:I18nService,
-    readonly opModalService:OpModalService,
-  ) {
-    super(elementRef, opContextMenu);
-  }
-
   ngOnInit() {
     this.buildItems();
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-settings-button/wp-settings-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-settings-button/wp-settings-button.component.ts
index 7ce89528228..671e389d27c 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-settings-button/wp-settings-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-settings-button/wp-settings-button.component.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 @Component({
@@ -39,6 +35,8 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   standalone: false,
 })
 export class WorkPackageSettingsButtonComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() hideTableOptions = false;
 
   @Input() showCalendarSharingOption = false;
@@ -46,7 +44,4 @@ export class WorkPackageSettingsButtonComponent {
   public text = {
     more_actions: this.I18n.t('js.button_more_actions'),
   };
-
-  constructor(readonly I18n:I18nService) {
-  }
 }
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-share-button/wp-share-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-share-button/wp-share-button.component.ts
index 5928d5d01e2..8e5d3e1796d 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-share-button/wp-share-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-share-button/wp-share-button.component.ts
@@ -27,7 +27,7 @@
 //++
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
@@ -51,6 +51,13 @@ import { CollectionResource } from 'core-app/features/hal/resources/collection-r
   standalone: false,
 })
 export class WorkPackageShareButtonComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly opModalService = inject(OpModalService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly bannersService = inject(BannersService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly actions$ = inject(ActionsService);
+
   @Input() public workPackage:WorkPackageResource;
 
   showEnterpriseIcon = !this.bannersService.allowsTo('work_package_sharing');
@@ -61,17 +68,6 @@ export class WorkPackageShareButtonComponent extends UntilDestroyedMixin impleme
     share: this.I18n.t('js.sharing.share'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly opModalService:OpModalService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly bannersService:BannersService,
-    readonly apiV3Service:ApiV3Service,
-    readonly actions$:ActionsService,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this.shareCount$ = this
       .actions$
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-status-button/wp-status-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-status-button/wp-status-button.component.ts
index 88c060906d3..b728d6e6f0c 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-status-button/wp-status-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-status-button/wp-status-button.component.ts
@@ -28,9 +28,7 @@
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { Highlighting } from 'core-app/features/work-packages/components/wp-fast-table/builders/highlighting/highlighting.functions';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
@@ -48,6 +46,11 @@ import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageStatusButtonComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly halEditing = inject(HalResourceEditingService);
+
   @Input() public workPackage:WorkPackageResource;
 
   @Input() public small = false;
@@ -58,13 +61,6 @@ export class WorkPackageStatusButtonComponent extends UntilDestroyedMixin implem
     workPackageStatusBlocked: this.I18n.t('js.work_packages.message_work_package_status_blocked'),
   };
 
-  constructor(readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly schemaCache:SchemaCacheService,
-    readonly halEditing:HalResourceEditingService) {
-    super();
-  }
-
   ngOnInit() {
     this.halEditing
       .temporaryEditResource(this.workPackage)
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-timeline-toggle-button/wp-timeline-toggle-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-timeline-toggle-button/wp-timeline-toggle-button.component.ts
index 12ffec68e32..1fd0c0c4a44 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-timeline-toggle-button/wp-timeline-toggle-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-timeline-toggle-button/wp-timeline-toggle-button.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewTimelineService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service';
 import { TimelineZoomLevel } from 'core-app/features/hal/resources/query-resource';
@@ -48,6 +46,10 @@ export interface TimelineButtonText extends ButtonControllerText {
   standalone: false,
 })
 export class WorkPackageTimelineButtonComponent extends AbstractWorkPackageButtonComponent implements OnInit {
+  readonly I18n:I18nService;
+  readonly cdRef = inject(ChangeDetectorRef);
+  wpTableTimeline = inject(WorkPackageViewTimelineService);
+
   public buttonId = 'work-packages-timeline-toggle-button';
 
   public iconClass = 'icon-view-timeline';
@@ -68,10 +70,12 @@ export class WorkPackageTimelineButtonComponent extends AbstractWorkPackageButto
 
   public isMinLevel = false;
 
-  constructor(readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-    public wpTableTimeline:WorkPackageViewTimelineService) {
+  constructor() {
+    const I18n = inject(I18nService);
+
     super(I18n);
+    this.I18n = I18n;
+
 
     this.activateLabel = I18n.t('js.gantt_chart.button_activate');
     this.deactivateLabel = I18n.t('js.gantt_chart.button_deactivate');
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/zen-mode-toggle-button/zen-mode-toggle-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/zen-mode-toggle-button/zen-mode-toggle-button.component.ts
index cb143a5e600..2871ebb5831 100644
--- a/frontend/src/app/features/work-packages/components/wp-buttons/zen-mode-toggle-button/zen-mode-toggle-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/zen-mode-toggle-button/zen-mode-toggle-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 import { AbstractWorkPackageButtonComponent } from '../wp-buttons.module';
@@ -39,6 +39,9 @@ import screenfull from 'screenfull';
   standalone: false,
 })
 export class ZenModeButtonComponent extends AbstractWorkPackageButtonComponent {
+  readonly I18n:I18nService;
+  readonly cdRef = inject(ChangeDetectorRef);
+
   public buttonId = 'work-packages-zen-mode-toggle-button';
 
   public buttonClass = 'toolbar-icon';
@@ -51,13 +54,12 @@ export class ZenModeButtonComponent extends AbstractWorkPackageButtonComponent {
 
   private deactivateLabel:string;
 
-  constructor(
-    // eslint-disable-next-line @angular-eslint/prefer-inject
-    readonly I18n:I18nService,
-    // eslint-disable-next-line @angular-eslint/prefer-inject
-    readonly cdRef:ChangeDetectorRef
-  ) {
+  constructor() {
+    const I18n = inject(I18nService);
+
     super(I18n);
+    this.I18n = I18n;
+
 
     this.activateLabel = I18n.t('js.zen_mode.button_activate');
     this.deactivateLabel = I18n.t('js.zen_mode.button_deactivate');
diff --git a/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-drag-and-drop.service.ts b/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-drag-and-drop.service.ts
index b3dcbbe9649..632622edd27 100644
--- a/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-drag-and-drop.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-drag-and-drop.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Injector, Optional } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { WorkPackageViewOrderService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-order.service';
 import { States } from 'core-app/core/states/states.service';
@@ -16,6 +16,16 @@ import { firstValueFrom } from 'rxjs';
 
 @Injectable()
 export class WorkPackageCardDragAndDropService {
+  readonly states = inject(States);
+  readonly injector = inject(Injector);
+  readonly reorderService = inject(WorkPackageViewOrderService);
+  readonly wpCreate = inject(WorkPackageCreateService);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly dragService = inject(DragAndDropService, { optional: true });
+  readonly wpInlineCreate = inject(WorkPackageInlineCreateService);
+
   private _workPackages:WorkPackageResource[];
 
   /** Whether the card view has an active inline created wp */
@@ -24,18 +34,6 @@ export class WorkPackageCardDragAndDropService {
   /** A reference to the component in use, to have access to the current input variables */
   public cardView:WorkPackageCardViewComponent;
 
-  public constructor(readonly states:States,
-    readonly injector:Injector,
-    readonly reorderService:WorkPackageViewOrderService,
-    readonly wpCreate:WorkPackageCreateService,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly apiV3Service:ApiV3Service,
-    readonly currentProject:CurrentProjectService,
-    @Optional() readonly dragService:DragAndDropService,
-    readonly wpInlineCreate:WorkPackageInlineCreateService) {
-
-  }
-
   public init(componentRef:WorkPackageCardViewComponent) {
     this.cardView = componentRef;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-view.service.ts b/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-view.service.ts
index bbbb69483b3..47f80f78eb8 100644
--- a/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-view.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-card-view/services/wp-card-view.service.ts
@@ -1,11 +1,11 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 
 @Injectable()
 export class WorkPackageCardViewService {
-  public constructor(readonly querySpace:IsolatedQuerySpace) {
-  }
+  readonly querySpace = inject(IsolatedQuerySpace);
+
 
   public classIdentifier(wp:WorkPackageResource) {
     // The same class names are used for the proximity to the table representation.
diff --git a/frontend/src/app/features/work-packages/components/wp-card-view/wp-card-view.component.ts b/frontend/src/app/features/work-packages/components/wp-card-view/wp-card-view.component.ts
index 9cf71531f98..8e0031b2d53 100644
--- a/frontend/src/app/features/work-packages/components/wp-card-view/wp-card-view.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-card-view/wp-card-view.component.ts
@@ -1,16 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Injector,
-  Input,
-  OnInit,
-  Output,
-  ViewChild, OnDestroy,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Injector, Input, OnInit, Output, ViewChild, OnDestroy, inject } from '@angular/core';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageInlineCreateService } from 'core-app/features/work-packages/components/wp-inline-create/wp-inline-create.service';
@@ -55,6 +43,25 @@ export type CardViewOrientation = 'horizontal'|'vertical';
   standalone: false,
 })
 export class WorkPackageCardViewComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit, WorkPackageViewOutputs, OnDestroy {
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly states = inject(States);
+  readonly injector = inject(Injector);
+  readonly $state = inject(StateService);
+  readonly I18n = inject(I18nService);
+  readonly wpCreate = inject(WorkPackageCreateService);
+  readonly wpInlineCreate = inject(WorkPackageInlineCreateService);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly halEvents = inject(HalEventsService);
+  readonly authorisationService = inject(AuthorisationService);
+  readonly causedUpdates = inject(CausedUpdatesService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly pathHelper = inject(PathHelperService);
+  readonly wpTableSelection = inject(WorkPackageViewSelectionService);
+  readonly wpViewOrder = inject(WorkPackageViewOrderService);
+  readonly cardView = inject(WorkPackageCardViewService);
+  readonly cardDragDrop = inject(WorkPackageCardDragAndDropService);
+  readonly deviceService = inject(DeviceService);
+
   @Input('dragOutOfHandler') public canDragOutOf:(wp:WorkPackageResource) => boolean;
 
   @Input() public dragInto:boolean;
@@ -119,27 +126,6 @@ export class WorkPackageCardViewComponent extends UntilDestroyedMixin implements
 
   isNewResource = isNewResource;
 
-  constructor(readonly querySpace:IsolatedQuerySpace,
-    readonly states:States,
-    readonly injector:Injector,
-    readonly $state:StateService,
-    readonly I18n:I18nService,
-    readonly wpCreate:WorkPackageCreateService,
-    readonly wpInlineCreate:WorkPackageInlineCreateService,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly halEvents:HalEventsService,
-    readonly authorisationService:AuthorisationService,
-    readonly causedUpdates:CausedUpdatesService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly pathHelper:PathHelperService,
-    readonly wpTableSelection:WorkPackageViewSelectionService,
-    readonly wpViewOrder:WorkPackageViewOrderService,
-    readonly cardView:WorkPackageCardViewService,
-    readonly cardDragDrop:WorkPackageCardDragAndDropService,
-    readonly deviceService:DeviceService) {
-    super();
-  }
-
   ngOnInit() {
     this.registerCreationCallback();
 
diff --git a/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions.component.ts b/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions.component.ts
index 8f94d5129b2..a99eca561b0 100644
--- a/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { CustomActionResource } from 'core-app/features/hal/resources/custom-action-resource';
@@ -42,20 +40,16 @@ import { BannersService } from 'core-app/core/enterprise/banners.service';
   standalone: false,
 })
 export class WpCustomActionsComponent extends UntilDestroyedMixin implements OnInit {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly bannersService = inject(BannersService);
+
   @Input() workPackage:WorkPackageResource;
 
   actions:CustomActionResource[] = [];
 
   available = this.bannersService.allowsTo('custom_actions');
 
-  constructor(
-    readonly apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-    readonly bannersService:BannersService,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this
       .apiV3Service
diff --git a/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions/wp-custom-action.component.ts b/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions/wp-custom-action.component.ts
index ea9cead6aee..604bf4a4e3a 100644
--- a/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions/wp-custom-action.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-custom-actions/wp-custom-actions/wp-custom-action.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, Input, OnInit, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { CustomActionResource } from 'core-app/features/hal/resources/custom-action-resource';
 import { HalEventsService } from 'core-app/features/hal/services/hal-events.service';
@@ -51,22 +51,18 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
   standalone: false,
 })
 export class WpCustomActionComponent extends UntilDestroyedMixin implements OnInit {
+  private halResourceService = inject(HalResourceService);
+  private apiV3Service = inject(ApiV3Service);
+  private wpActivity = inject(WorkPackagesActivityService);
+  private notificationService = inject(WorkPackageNotificationService);
+  private halEditing = inject(HalResourceEditingService);
+  private halEvents = inject(HalEventsService);
+  private cdRef = inject(ChangeDetectorRef);
+
   @Input() workPackage:WorkPackageResource;
 
   @Input() action:CustomActionResource;
 
-  constructor(
-    private halResourceService:HalResourceService,
-    private apiV3Service:ApiV3Service,
-    private wpActivity:WorkPackagesActivityService,
-    private notificationService:WorkPackageNotificationService,
-    private halEditing:HalResourceEditingService,
-    private halEvents:HalEventsService,
-    private cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this
       .halEvents
diff --git a/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts b/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts
index 3d3ad0323f7..383b4154d16 100644
--- a/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -44,6 +44,11 @@ import { Observable, of } from 'rxjs';
   standalone: false,
 })
 export class WorkPackageSplitViewToolbarComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly halEditing = inject(HalResourceEditingService);
+  readonly configurationService = inject(ConfigurationService);
+  readonly currentUserService = inject(CurrentUserService);
+
   @Input() workPackage:WorkPackageResource;
 
   @Input() displayNotificationsButton:boolean;
@@ -55,14 +60,6 @@ export class WorkPackageSplitViewToolbarComponent implements OnInit {
     button_more: this.I18n.t('js.button_more'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly halEditing:HalResourceEditingService,
-    readonly configurationService:ConfigurationService,
-    readonly currentUserService:CurrentUserService,
-  ) {
-  }
-
   ngOnInit() {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
     this.displayShareButton$ = this.currentUserService.hasCapabilities$('work_package_shares/index', this.workPackage.project.id);
diff --git a/frontend/src/app/features/work-packages/components/wp-edit/wp-edit-field/wp-replacement-label.component.ts b/frontend/src/app/features/work-packages/components/wp-edit/wp-edit-field/wp-replacement-label.component.ts
index 70919c585f0..6b7a7cba7f1 100644
--- a/frontend/src/app/features/work-packages/components/wp-edit/wp-edit-field/wp-replacement-label.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-edit/wp-edit-field/wp-replacement-label.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, Component, ElementRef, Input, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, inject } from '@angular/core';
 import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-form/edit-form.component';
 
 @Component({
@@ -41,14 +39,13 @@ import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-f
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageReplacementLabelComponent implements OnInit {
+  protected wpeditForm = inject(EditFormComponent);
+  protected elementRef = inject(ElementRef);
+
   @Input() public fieldName:string;
 
   private element:HTMLElement;
 
-  constructor(protected wpeditForm:EditFormComponent,
-    protected elementRef:ElementRef) {
-  }
-
   ngOnInit() {
     this.element = this.elementRef.nativeElement;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-form-group/wp-attribute-group.component.ts b/frontend/src/app/features/work-packages/components/wp-form-group/wp-attribute-group.component.ts
index 4a8ebf88201..1327b19968d 100644
--- a/frontend/src/app/features/work-packages/components/wp-form-group/wp-attribute-group.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-form-group/wp-attribute-group.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, HostBinding, Injector, Input, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Injector, Input, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-form/edit-form.component';
@@ -48,6 +48,10 @@ import {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageFormAttributeGroupComponent extends UntilDestroyedMixin {
+  readonly I18n = inject(I18nService);
+  wpEditForm = inject(EditFormComponent);
+  protected injector = inject(Injector);
+
   @HostBinding('class.wp-attribute-group') className = true;
   @HostBinding('class.attributes-group--attributes') parentClassName = true;
 
@@ -55,14 +59,6 @@ export class WorkPackageFormAttributeGroupComponent extends UntilDestroyedMixin
 
   @Input() public group:GroupDescriptor;
 
-  constructor(
-    readonly I18n:I18nService,
-    public wpEditForm:EditFormComponent,
-    protected injector:Injector,
-  ) {
-    super();
-  }
-
   /**
    * Hide read-only fields, but only when in the create mode
    * @param {FieldDescriptor} field
diff --git a/frontend/src/app/features/work-packages/components/wp-grid/wp-grid.component.ts b/frontend/src/app/features/work-packages/components/wp-grid/wp-grid.component.ts
index 635b6060a39..8b872922e0f 100644
--- a/frontend/src/app/features/work-packages/components/wp-grid/wp-grid.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-grid/wp-grid.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output, OnInit, inject } from '@angular/core';
 import { WorkPackageViewHighlightingService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service';
 import { CardViewOrientation } from 'core-app/features/work-packages/components/wp-card-view/wp-card-view.component';
 import { WorkPackageViewSortByService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-sort-by.service';
@@ -74,6 +72,12 @@ import { WorkPackageViewOutputs } from 'core-app/features/work-packages/routing/
   standalone: false,
 })
 export class WorkPackagesGridComponent implements WorkPackageViewOutputs, OnInit {
+  readonly wpTableHighlight = inject(WorkPackageViewHighlightingService);
+  readonly wpTableSortBy = inject(WorkPackageViewSortByService);
+  readonly wpList = inject(WorkPackagesListService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() public configuration:WorkPackageTableConfiguration;
 
   @Input() public showResizer = false;
@@ -96,13 +100,6 @@ export class WorkPackagesGridComponent implements WorkPackageViewOutputs, OnInit
 
   public highlightingMode:HighlightingMode = 'none';
 
-  constructor(readonly wpTableHighlight:WorkPackageViewHighlightingService,
-    readonly wpTableSortBy:WorkPackageViewSortByService,
-    readonly wpList:WorkPackagesListService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly cdRef:ChangeDetectorRef) {
-  }
-
   ngOnInit() {
     this.dragInto = this.configuration.dragAndDropEnabled;
     this.canDragOutOf = () => this.configuration.dragAndDropEnabled;
diff --git a/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.component.ts b/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.component.ts
index 97473e2d33a..daecf685f38 100644
--- a/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.component.ts
@@ -26,19 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostListener,
-  Injector,
-  Input,
-  OnInit,
-  Output,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Injector, Input, OnInit, Output, inject } from '@angular/core';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import {
   WorkPackageViewFocusService,
@@ -81,6 +69,19 @@ import { delegate, DelegateEvent } from '@knowledgecode/delegate';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageInlineCreateComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit {
+  readonly injector = inject(Injector);
+  protected readonly elementRef = inject(ElementRef);
+  protected readonly schemaCache = inject(SchemaCacheService);
+  protected readonly I18n = inject(I18nService);
+  protected readonly querySpace = inject(IsolatedQuerySpace);
+  protected readonly cdRef = inject(ChangeDetectorRef);
+  protected readonly wpCreate = inject(WorkPackageCreateService);
+  protected readonly wpInlineCreate = inject(WorkPackageInlineCreateService);
+  protected readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  protected readonly wpTableFocus = inject(WorkPackageViewFocusService);
+  protected readonly halEditing = inject(HalResourceEditingService);
+  protected readonly authorisationService = inject(AuthorisationService);
+
   @Input() colspan:number;
 
   @Input() table:WorkPackageTable;
@@ -113,21 +114,6 @@ export class WorkPackageInlineCreateComponent extends UntilDestroyedMixin implem
     return this.mode !== 'inactive';
   }
 
-  constructor(public readonly injector:Injector,
-    protected readonly elementRef:ElementRef,
-    protected readonly schemaCache:SchemaCacheService,
-    protected readonly I18n:I18nService,
-    protected readonly querySpace:IsolatedQuerySpace,
-    protected readonly cdRef:ChangeDetectorRef,
-    protected readonly wpCreate:WorkPackageCreateService,
-    protected readonly wpInlineCreate:WorkPackageInlineCreateService,
-    protected readonly wpTableColumns:WorkPackageViewColumnsService,
-    protected readonly wpTableFocus:WorkPackageViewFocusService,
-    protected readonly halEditing:HalResourceEditingService,
-    protected readonly authorisationService:AuthorisationService) {
-    super();
-  }
-
   ngOnInit() {
     this.element = this.elementRef.nativeElement;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.service.ts b/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.service.ts
index 64996713ebe..ab4efddfc21 100644
--- a/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-inline-create/wp-inline-create.service.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  Injectable,
-  Injector,
-  OnDestroy,
-} from '@angular/core';
+import { Injectable, Injector, OnDestroy, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import {
   Observable,
@@ -45,15 +41,14 @@ import { CurrentProjectService } from 'core-app/core/current-project/current-pro
 
 @Injectable()
 export class WorkPackageInlineCreateService implements OnDestroy {
+  readonly injector = inject(Injector);
+
   @InjectField() I18n!:I18nService;
 
   @InjectField() protected readonly currentUser:CurrentUserService;
 
   @InjectField() protected readonly currentProject:CurrentProjectService;
 
-  constructor(readonly injector:Injector) {
-  }
-
   /**
    * A separate reference pane for the inline create component
    */
diff --git a/frontend/src/app/features/work-packages/components/wp-list/wp-list-checksum.service.ts b/frontend/src/app/features/work-packages/components/wp-list/wp-list-checksum.service.ts
index 8b214522f5f..72d2446e1e9 100644
--- a/frontend/src/app/features/work-packages/components/wp-list/wp-list-checksum.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-list/wp-list-checksum.service.ts
@@ -28,16 +28,16 @@
 
 import { StateService, TransitionPromise } from '@uirouter/core';
 import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageViewPagination } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-table-pagination';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { Subject } from 'rxjs';
 
 @Injectable()
 export class WorkPackagesListChecksumService {
-  constructor(protected UrlParamsHelper:UrlParamsHelperService,
-    protected $state:StateService) {
-  }
+  protected UrlParamsHelper = inject(UrlParamsHelperService);
+  protected $state = inject(StateService);
+
 
   public id:string|null;
 
diff --git a/frontend/src/app/features/work-packages/components/wp-list/wp-list-invalid-query.service.ts b/frontend/src/app/features/work-packages/components/wp-list/wp-list-invalid-query.service.ts
index 64d5d8bd965..e576e7ca231 100644
--- a/frontend/src/app/features/work-packages/components/wp-list/wp-list-invalid-query.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-list/wp-list-invalid-query.service.ts
@@ -27,7 +27,7 @@
 //++
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { QueryFilterInstanceSchemaResource } from 'core-app/features/hal/resources/query-filter-instance-schema-resource';
 import { QueryFormResource } from 'core-app/features/hal/resources/query-form-resource';
@@ -39,8 +39,8 @@ import { QueryColumn } from '../wp-query/query-column';
 
 @Injectable()
 export class WorkPackagesListInvalidQueryService {
-  constructor(protected halResourceService:HalResourceService) {
-  }
+  protected halResourceService = inject(HalResourceService);
+
 
   public restoreQuery(query:QueryResource, form:QueryFormResource) {
     this.restoreFilters(query, form.payload, form.schema);
diff --git a/frontend/src/app/features/work-packages/components/wp-list/wp-list.service.ts b/frontend/src/app/features/work-packages/components/wp-list/wp-list.service.ts
index 6b47e92c2b6..ffa019a4d83 100644
--- a/frontend/src/app/features/work-packages/components/wp-list/wp-list.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-list/wp-list.service.ts
@@ -31,7 +31,7 @@ import { States } from 'core-app/core/states/states.service';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import { StateService } from '@uirouter/core';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import isPersistedResource from 'core-app/features/hal/helpers/is-persisted-resource';
 import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
@@ -63,6 +63,23 @@ export interface QueryDefinition {
 
 @Injectable()
 export class WorkPackagesListService {
+  readonly injector = inject(Injector);
+  protected toastService = inject(ToastService);
+  readonly I18n = inject(I18nService);
+  protected UrlParamsHelper = inject(UrlParamsHelperService);
+  protected authorisationService = inject(AuthorisationService);
+  protected $state = inject(StateService);
+  protected apiV3Service = inject(ApiV3Service);
+  protected states = inject(States);
+  protected querySpace = inject(IsolatedQuerySpace);
+  protected pagination = inject(PaginationService);
+  protected configuration = inject(ConfigurationService);
+  protected wpTablePagination = inject(WorkPackageViewPaginationService);
+  protected wpStatesInitialization = inject(WorkPackageStatesInitializationService);
+  protected wpListInvalidQueryService = inject(WorkPackagesListInvalidQueryService);
+  protected wpQueryView = inject(WorkPackagesQueryViewService);
+  protected submenuService = inject(SubmenuService);
+
   @InjectField() protected readonly currentUser:CurrentUserService;
 
   // We remember the query requests coming in so we can ensure only the latest request is being tended to
@@ -88,25 +105,6 @@ export class WorkPackagesListService {
       share(),
     );
 
-  constructor(
-    readonly injector:Injector,
-    protected toastService:ToastService,
-    readonly I18n:I18nService,
-    protected UrlParamsHelper:UrlParamsHelperService,
-    protected authorisationService:AuthorisationService,
-    protected $state:StateService,
-    protected apiV3Service:ApiV3Service,
-    protected states:States,
-    protected querySpace:IsolatedQuerySpace,
-    protected pagination:PaginationService,
-    protected configuration:ConfigurationService,
-    protected wpTablePagination:WorkPackageViewPaginationService,
-    protected wpStatesInitialization:WorkPackageStatesInitializationService,
-    protected wpListInvalidQueryService:WorkPackagesListInvalidQueryService,
-    protected wpQueryView:WorkPackagesQueryViewService,
-    protected submenuService:SubmenuService,
-  ) { }
-
   /**
    * Stream a query request as a HTTP observable. Each request to this method will
    * result in a new HTTP request.
diff --git a/frontend/src/app/features/work-packages/components/wp-list/wp-query-view.service.ts b/frontend/src/app/features/work-packages/components/wp-list/wp-query-view.service.ts
index e9b7d05c6e0..b9aaba7c476 100644
--- a/frontend/src/app/features/work-packages/components/wp-list/wp-query-view.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-list/wp-query-view.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { Observable } from 'rxjs';
@@ -8,10 +8,9 @@ import { ConfigurationService } from 'core-app/core/config/configuration.service
 
 @Injectable()
 export class WorkPackagesQueryViewService {
-  constructor(
-    protected $state:StateService,
-    protected apiV3Service:ApiV3Service,
-  ) { }
+  protected $state = inject(StateService);
+  protected apiV3Service = inject(ApiV3Service);
+
 
   create(query:QueryResource):Observable<IView> {
     if (!query.href) {
diff --git a/frontend/src/app/features/work-packages/components/wp-list/wp-states-initialization.service.ts b/frontend/src/app/features/work-packages/components/wp-list/wp-states-initialization.service.ts
index ddca30dd19d..e38645c9884 100644
--- a/frontend/src/app/features/work-packages/components/wp-list/wp-states-initialization.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-list/wp-states-initialization.service.ts
@@ -2,7 +2,7 @@ import { States } from 'core-app/core/states/states.service';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageViewHighlightingService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service';
 import { take } from 'rxjs/operators';
 import { WorkPackageViewOrderService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-order.service';
@@ -29,29 +29,28 @@ import { WorkPackageViewBaselineService } from 'core-app/features/work-packages/
 
 @Injectable()
 export class WorkPackageStatesInitializationService {
-  constructor(
-    protected states:States,
-    protected querySpace:IsolatedQuerySpace,
-    protected wpTableColumns:WorkPackageViewColumnsService,
-    protected wpTableGroupBy:WorkPackageViewGroupByService,
-    protected wpTableGroupFold:WorkPackageViewCollapsedGroupsService,
-    protected wpTableSortBy:WorkPackageViewSortByService,
-    protected wpTableFilters:WorkPackageViewFiltersService,
-    protected wpTableSum:WorkPackageViewSumService,
-    protected wpTableTimeline:WorkPackageViewTimelineService,
-    protected wpTableHierarchies:WorkPackageViewHierarchiesService,
-    protected wpTableHighlighting:WorkPackageViewHighlightingService,
-    protected wpTableRelationColumns:WorkPackageViewRelationColumnsService,
-    protected wpTablePagination:WorkPackageViewPaginationService,
-    protected wpTableOrder:WorkPackageViewOrderService,
-    protected wpTableAdditionalElements:WorkPackageViewAdditionalElementsService,
-    protected apiV3Service:ApiV3Service,
-    protected wpListChecksumService:WorkPackagesListChecksumService,
-    protected authorisationService:AuthorisationService,
-    protected wpDisplayRepresentation:WorkPackageViewDisplayRepresentationService,
-    protected wpIncludeSubprojects:WorkPackageViewIncludeSubprojectsService,
-    protected wpTimestamps:WorkPackageViewBaselineService,
-  ) { }
+  protected states = inject(States);
+  protected querySpace = inject(IsolatedQuerySpace);
+  protected wpTableColumns = inject(WorkPackageViewColumnsService);
+  protected wpTableGroupBy = inject(WorkPackageViewGroupByService);
+  protected wpTableGroupFold = inject(WorkPackageViewCollapsedGroupsService);
+  protected wpTableSortBy = inject(WorkPackageViewSortByService);
+  protected wpTableFilters = inject(WorkPackageViewFiltersService);
+  protected wpTableSum = inject(WorkPackageViewSumService);
+  protected wpTableTimeline = inject(WorkPackageViewTimelineService);
+  protected wpTableHierarchies = inject(WorkPackageViewHierarchiesService);
+  protected wpTableHighlighting = inject(WorkPackageViewHighlightingService);
+  protected wpTableRelationColumns = inject(WorkPackageViewRelationColumnsService);
+  protected wpTablePagination = inject(WorkPackageViewPaginationService);
+  protected wpTableOrder = inject(WorkPackageViewOrderService);
+  protected wpTableAdditionalElements = inject(WorkPackageViewAdditionalElementsService);
+  protected apiV3Service = inject(ApiV3Service);
+  protected wpListChecksumService = inject(WorkPackagesListChecksumService);
+  protected authorisationService = inject(AuthorisationService);
+  protected wpDisplayRepresentation = inject(WorkPackageViewDisplayRepresentationService);
+  protected wpIncludeSubprojects = inject(WorkPackageViewIncludeSubprojectsService);
+  protected wpTimestamps = inject(WorkPackageViewBaselineService);
+
 
   /**
    * Initialize the query and table states from the given query and results.
diff --git a/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts b/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts
index 340847154b2..2a7dc88f0b4 100644
--- a/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectorRef,
-  Directive,
-  Injector,
-  Input,
-  OnInit,
-  ViewChild, OnDestroy,
-} from '@angular/core';
+import { ChangeDetectorRef, Directive, Injector, Input, OnInit, ViewChild, OnDestroy, inject } from '@angular/core';
 import {
   StateService,
   Transition,
@@ -63,6 +56,20 @@ import { HalSource } from 'core-app/features/hal/interfaces';
 
 @Directive()
 export class WorkPackageCreateComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  readonly injector = inject(Injector);
+  protected readonly $state = inject(StateService);
+  protected readonly I18n = inject(I18nService);
+  protected readonly titleService = inject(OpTitleService);
+  protected readonly notificationService = inject(WorkPackageNotificationService);
+  protected readonly states = inject(States);
+  protected readonly wpCreate = inject(WorkPackageCreateService);
+  protected readonly wpViewFocus = inject(WorkPackageViewFocusService);
+  protected readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  protected readonly pathHelper = inject(PathHelperService);
+  protected readonly apiV3Service = inject(ApiV3Service);
+  protected readonly currentProjectService = inject(CurrentProjectService);
+  protected readonly cdRef = inject(ChangeDetectorRef);
+
   public successState:string = splitViewRoute(this.$state);
 
   public cancelState:string = this.$state?.current?.data?.baseRoute;
@@ -89,24 +96,6 @@ export class WorkPackageCreateComponent extends UntilDestroyedMixin implements O
   /** Explicitly remember destroy state in this abstract base */
   protected destroyed = false;
 
-  constructor(
-    public readonly injector:Injector,
-    protected readonly $state:StateService,
-    protected readonly I18n:I18nService,
-    protected readonly titleService:OpTitleService,
-    protected readonly notificationService:WorkPackageNotificationService,
-    protected readonly states:States,
-    protected readonly wpCreate:WorkPackageCreateService,
-    protected readonly wpViewFocus:WorkPackageViewFocusService,
-    protected readonly wpTableFilters:WorkPackageViewFiltersService,
-    protected readonly pathHelper:PathHelperService,
-    protected readonly apiV3Service:ApiV3Service,
-    protected readonly currentProjectService:CurrentProjectService,
-    protected readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   public ngOnInit() {
     // In case the create form is still routed via Angular, the stateParams are empty. We then read the params from the Transition
     if (this.routedFromAngular) {
diff --git a/frontend/src/app/features/work-packages/components/wp-new/wp-create.service.ts b/frontend/src/app/features/work-packages/components/wp-new/wp-create.service.ts
index 99bbcf29a6d..ed928939038 100644
--- a/frontend/src/app/features/work-packages/components/wp-new/wp-create.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-new/wp-create.service.ts
@@ -26,10 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  Injectable,
-  Injector,
-} from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import {
   firstValueFrom,
   Observable,
@@ -68,23 +65,23 @@ export const newWorkPackageHref = '/api/v3/work_packages/new';
 
 @Injectable()
 export class WorkPackageCreateService extends UntilDestroyedMixin {
+  protected injector = inject(Injector);
+  protected hooks = inject(HookService);
+  protected apiV3Service = inject(ApiV3Service);
+  protected halResourceService = inject(HalResourceService);
+  protected querySpace = inject(IsolatedQuerySpace);
+  protected authorisationService = inject(AuthorisationService);
+  protected halEditing = inject(HalResourceEditingService);
+  protected schemaCache = inject(SchemaCacheService);
+  protected halEvents = inject(HalEventsService);
+  protected attachmentsService = inject(AttachmentsResourceService);
+
   protected form:Promise<FormResource>|undefined;
 
   // Allow callbacks to happen on newly created work packages
   protected newWorkPackageCreatedSubject = new Subject<WorkPackageResource>();
 
-  constructor(
-    protected injector:Injector,
-    protected hooks:HookService,
-    protected apiV3Service:ApiV3Service,
-    protected halResourceService:HalResourceService,
-    protected querySpace:IsolatedQuerySpace,
-    protected authorisationService:AuthorisationService,
-    protected halEditing:HalResourceEditingService,
-    protected schemaCache:SchemaCacheService,
-    protected halEvents:HalEventsService,
-    protected attachmentsService:AttachmentsResourceService,
-  ) {
+  constructor() {
     super();
 
     this.halEditing
diff --git a/frontend/src/app/features/work-packages/components/wp-query/query-filters.service.ts b/frontend/src/app/features/work-packages/components/wp-query/query-filters.service.ts
index ef0a450e64a..ea889854dff 100644
--- a/frontend/src/app/features/work-packages/components/wp-query/query-filters.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-query/query-filters.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QueryFormResource } from 'core-app/features/hal/resources/query-form-resource';
 import {
   QueryFilterInstanceSchemaResource,
@@ -11,8 +11,8 @@ import { CollectionResource } from 'core-app/features/hal/resources/collection-r
 
 @Injectable()
 export class QueryFiltersService {
-  constructor(protected schemaCache:SchemaCacheService) {
-  }
+  protected schemaCache = inject(SchemaCacheService);
+
 
   /**
    * Get the matching schema of the filter resource
diff --git a/frontend/src/app/features/work-packages/components/wp-query/query-param-listener.service.ts b/frontend/src/app/features/work-packages/components/wp-query/query-param-listener.service.ts
index adf14df4d0c..c10d297612f 100644
--- a/frontend/src/app/features/work-packages/components/wp-query/query-param-listener.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-query/query-param-listener.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { WorkPackagesListChecksumService } from 'core-app/features/work-packages/components/wp-list/wp-list-checksum.service';
 import { WorkPackagesListService } from 'core-app/features/work-packages/components/wp-list/wp-list.service';
 import { TransitionService } from '@uirouter/core';
@@ -34,6 +34,8 @@ import { Subject } from 'rxjs';
 
 @Injectable()
 export class QueryParamListenerService {
+  readonly injector = inject(Injector);
+
   readonly wpListChecksumService:WorkPackagesListChecksumService = this.injector.get(WorkPackagesListChecksumService);
 
   readonly wpListService:WorkPackagesListService = this.injector.get(WorkPackagesListService);
@@ -44,7 +46,7 @@ export class QueryParamListenerService {
 
   public queryChangeListener:Function;
 
-  constructor(readonly injector:Injector) {
+  constructor() {
     this.listenForQueryParamsChanged();
   }
 
diff --git a/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.spec.ts b/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.spec.ts
index 0ca8f1bc024..0a94e526349 100644
--- a/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.spec.ts
+++ b/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.spec.ts
@@ -26,16 +26,29 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { TestBed } from '@angular/core/testing';
 import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
+import { PaginationService } from 'core-app/shared/components/table-pagination/pagination-service';
 
 describe('UrlParamsHelper', () => {
   const paginationStub = {
     getPerPage: () => 20,
   } as any;
 
-  const UrlParamsHelper = new UrlParamsHelperService(paginationStub);
+  let UrlParamsHelper:UrlParamsHelperService;
   let queryString;
 
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        UrlParamsHelperService,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        { provide: PaginationService, useValue: paginationStub },
+      ],
+    });
+    UrlParamsHelper = TestBed.inject(UrlParamsHelperService);
+  });
+
   describe('buildQueryString', () => {
     const params = {
       ids: [1, 2, 3],
diff --git a/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.ts b/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.ts
index 79478a48dab..1ad8c474663 100644
--- a/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.ts
+++ b/frontend/src/app/features/work-packages/components/wp-query/url-params-helper.ts
@@ -31,7 +31,7 @@ import { QuerySortByResource } from 'core-app/features/hal/resources/query-sort-
 import { HalLink } from 'core-app/features/hal/hal-link/hal-link';
 import idFromLink from 'core-app/features/hal/helpers/id-from-link';
 import isPersistedResource from 'core-app/features/hal/helpers/is-persisted-resource';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
 import { ApiV3Filter, ApiV3FilterBuilder, FilterOperator } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder';
 import { PaginationService } from 'core-app/shared/components/table-pagination/pagination-service';
@@ -102,8 +102,8 @@ export interface QueryRequestParams {
 
 @Injectable({ providedIn: 'root' })
 export class UrlParamsHelperService {
-  public constructor(public paginationService:PaginationService) {
-  }
+  paginationService = inject(PaginationService);
+
 
   // copied more or less from angular buildUrl
   public buildQueryString(params:any) {
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-inline-create.service.ts b/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-inline-create.service.ts
index 633708ee788..93926348376 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-inline-create.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-inline-create.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { WorkPackageRelationsHierarchyService } from 'core-app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service';
 import { WorkPackageInlineCreateService } from 'core-app/features/work-packages/components/wp-inline-create/wp-inline-create.service';
@@ -41,11 +41,8 @@ import idFromLink from 'core-app/features/hal/helpers/id-from-link';
 
 @Injectable()
 export class WpChildrenInlineCreateService extends WorkPackageInlineCreateService implements WpRelationInlineCreateServiceInterface {
-  constructor(readonly injector:Injector,
-    protected readonly wpRelationsHierarchyService:WorkPackageRelationsHierarchyService,
-    protected readonly schemaCache:SchemaCacheService) {
-    super(injector);
-  }
+  protected readonly wpRelationsHierarchyService = inject(WorkPackageRelationsHierarchyService);
+  protected readonly schemaCache = inject(SchemaCacheService);
 
   /**
    * A separate reference pane for the inline create component
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-query.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-query.component.ts
index d0ffc9275db..1bd82798aa0 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-query.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/embedded/children/wp-children-query.component.ts
@@ -26,11 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
 import { WorkPackageRelationsHierarchyService } from 'core-app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service';
 import { OpUnlinkTableAction } from 'core-app/features/work-packages/components/wp-table/table-actions/actions/unlink-table-action';
 import { OpTableActionFactory } from 'core-app/features/work-packages/components/wp-table/table-actions/table-action';
@@ -58,6 +57,14 @@ import { WorkPackageRelationsService } from 'core-app/features/work-packages/com
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageChildrenQueryComponent extends WorkPackageRelationQueryBase implements OnInit {
+  protected wpRelationsHierarchyService = inject(WorkPackageRelationsHierarchyService);
+  protected PathHelper = inject(PathHelperService);
+  protected wpInlineCreate = inject(WorkPackageInlineCreateService);
+  protected halEvents = inject(HalEventsService);
+  protected apiV3Service = inject(ApiV3Service);
+  readonly I18n = inject(I18nService);
+  readonly wpRelations = inject(WorkPackageRelationsService);
+
   @Input() public workPackage:WorkPackageResource;
 
   @Input() public query:QueryResource;
@@ -82,19 +89,6 @@ export class WorkPackageChildrenQueryComponent extends WorkPackageRelationQueryB
     ),
   ];
 
-  constructor(
-    protected wpRelationsHierarchyService:WorkPackageRelationsHierarchyService,
-    protected PathHelper:PathHelperService,
-    protected wpInlineCreate:WorkPackageInlineCreateService,
-    protected halEvents:HalEventsService,
-    protected apiV3Service:ApiV3Service,
-    protected queryUrlParamsHelper:UrlParamsHelperService,
-    readonly I18n:I18nService,
-    readonly wpRelations:WorkPackageRelationsService,
-    ) {
-    super(queryUrlParamsHelper);
-  }
-
   ngOnInit() {
     // Set reference target and reference class
     this.wpInlineCreate.referenceTarget = this.workPackage;
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/embedded/inline/add-existing/wp-relation-inline-add-existing.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/embedded/inline/add-existing/wp-relation-inline-add-existing.component.ts
index 3057f20973b..7f814538a47 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/embedded/inline/add-existing/wp-relation-inline-add-existing.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/embedded/inline/add-existing/wp-relation-inline-add-existing.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   WorkPackageInlineCreateService,
@@ -61,6 +61,16 @@ import { FilterOperator } from 'core-app/shared/helpers/api-v3/api-v3-filter-bui
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpRelationInlineAddExistingComponent {
+  protected readonly parent = inject(WorkPackageInlineCreateComponent);
+  protected readonly wpInlineCreate = inject(WorkPackageInlineCreateService) as WpRelationInlineCreateServiceInterface;
+  protected apiV3Service = inject(ApiV3Service);
+  protected wpRelations = inject(WorkPackageRelationsService);
+  protected notificationService = inject(WorkPackageNotificationService);
+  protected halEvents = inject(HalEventsService);
+  protected urlParamsHelper = inject(UrlParamsHelperService);
+  protected querySpace = inject(IsolatedQuerySpace);
+  protected readonly I18n = inject(I18nService);
+
   public selectedWpId:string;
 
   public isDisabled = false;
@@ -71,18 +81,6 @@ export class WpRelationInlineAddExistingComponent {
     abort: this.I18n.t('js.relation_buttons.abort'),
   };
 
-  constructor(
-    protected readonly parent:WorkPackageInlineCreateComponent,
-    @Inject(WorkPackageInlineCreateService) protected readonly wpInlineCreate:WpRelationInlineCreateServiceInterface,
-    protected apiV3Service:ApiV3Service,
-    protected wpRelations:WorkPackageRelationsService,
-    protected notificationService:WorkPackageNotificationService,
-    protected halEvents:HalEventsService,
-    protected urlParamsHelper:UrlParamsHelperService,
-    protected querySpace:IsolatedQuerySpace,
-    protected readonly I18n:I18nService,
-  ) {}
-
   public addExisting() {
     if (_.isNil(this.selectedWpId)) {
       return;
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-inline-create.service.ts b/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-inline-create.service.ts
index df66e0976a4..8352fad2383 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-inline-create.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-inline-create.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { WorkPackageInlineCreateService } from 'core-app/features/work-packages/components/wp-inline-create/wp-inline-create.service';
 import { WpRelationInlineAddExistingComponent } from 'core-app/features/work-packages/components/wp-relations/embedded/inline/add-existing/wp-relation-inline-add-existing.component';
@@ -46,10 +46,6 @@ export class WpRelationInlineCreateService extends WorkPackageInlineCreateServic
 
   @InjectField() halEvents:HalEventsService;
 
-  constructor(public injector:Injector) {
-    super(injector);
-  }
-
   /**
    * A separate reference pane for the inline create component
    */
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-query.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-query.component.ts
index 30a888bb6ce..35a6d33b7c9 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-query.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/embedded/relations/wp-relation-query.component.ts
@@ -26,17 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Inject,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
 import { OpUnlinkTableAction } from 'core-app/features/work-packages/components/wp-table/table-actions/actions/unlink-table-action';
 import { OpTableActionFactory } from 'core-app/features/work-packages/components/wp-table/table-actions/table-action';
 import { WorkPackageInlineCreateService } from 'core-app/features/work-packages/components/wp-inline-create/wp-inline-create.service';
@@ -63,6 +56,13 @@ import { GroupDescriptor } from 'core-app/features/work-packages/components/wp-s
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageRelationQueryComponent extends WorkPackageRelationQueryBase implements OnInit {
+  protected readonly PathHelper = inject(PathHelperService);
+  protected readonly wpInlineCreate = inject(WorkPackageInlineCreateService) as WpRelationInlineCreateService;
+  protected readonly wpRelations = inject(WorkPackageRelationsService);
+  protected readonly halEvents = inject(HalEventsService);
+  protected readonly notificationService = inject(WorkPackageNotificationService);
+  protected readonly I18n = inject(I18nService);
+
   @Input() public workPackage:WorkPackageResource;
 
   @Input() public query:QueryResource;
@@ -89,16 +89,6 @@ export class WorkPackageRelationQueryComponent extends WorkPackageRelationQueryB
 
   public idFromLink = idFromLink;
 
-  constructor(protected readonly PathHelper:PathHelperService,
-              @Inject(WorkPackageInlineCreateService) protected readonly wpInlineCreate:WpRelationInlineCreateService,
-              protected readonly wpRelations:WorkPackageRelationsService,
-              protected readonly halEvents:HalEventsService,
-              protected readonly queryUrlParamsHelper:UrlParamsHelperService,
-              protected readonly notificationService:WorkPackageNotificationService,
-              protected readonly I18n:I18nService) {
-    super(queryUrlParamsHelper);
-  }
-
   ngOnInit() {
     const relationType = this.getRelationTypeFromQuery();
 
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/embedded/wp-relation-query.base.ts b/frontend/src/app/features/work-packages/components/wp-relations/embedded/wp-relation-query.base.ts
index 890b0176532..8a97dcb5b12 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/embedded/wp-relation-query.base.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/embedded/wp-relation-query.base.ts
@@ -27,7 +27,7 @@
 //++
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { Directive, ViewChild } from '@angular/core';
+import { Directive, ViewChild, inject } from '@angular/core';
 import { WorkPackageEmbeddedTableComponent } from 'core-app/features/work-packages/components/wp-table/embedded/wp-embedded-table.component';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
@@ -35,6 +35,8 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
 
 @Directive()
 export abstract class WorkPackageRelationQueryBase extends UntilDestroyedMixin {
+  protected queryUrlParamsHelper = inject(UrlParamsHelperService);
+
   public workPackage:WorkPackageResource;
 
   /** Input is either a query resource, or directly query props */
@@ -49,10 +51,6 @@ export abstract class WorkPackageRelationQueryBase extends UntilDestroyedMixin {
   /** Reference to the embedded table instance */
   @ViewChild('embeddedTable') protected embeddedTable?:WorkPackageEmbeddedTableComponent;
 
-  constructor(protected queryUrlParamsHelper:UrlParamsHelperService) {
-    super();
-  }
-
   /**
    * Request to refresh the results of the embedded table
    */
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts
index 2fafea2ad62..0ac5e207e7e 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relation-row/wp-relation-row.component.ts
@@ -1,8 +1,6 @@
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalEventsService } from 'core-app/features/hal/services/hal-events.service';
 import { WorkPackageNotificationService } from 'core-app/features/work-packages/services/notifications/work-package-notification.service';
@@ -23,6 +21,14 @@ import { Highlighting } from 'core-app/features/work-packages/components/wp-fast
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageRelationRowComponent extends UntilDestroyedMixin implements OnInit {
+  protected apiV3Service = inject(ApiV3Service);
+  protected notificationService = inject(WorkPackageNotificationService);
+  protected wpRelations = inject(WorkPackageRelationsService);
+  protected halEvents = inject(HalEventsService);
+  protected I18n = inject(I18nService);
+  protected cdRef = inject(ChangeDetectorRef);
+  protected PathHelper = inject(PathHelperService);
+
   @Input() public workPackage:WorkPackageResource;
 
   @Input() public relatedWorkPackage:WorkPackageResource;
@@ -70,16 +76,6 @@ export class WorkPackageRelationRowComponent extends UntilDestroyedMixin impleme
     },
   };
 
-  constructor(protected apiV3Service:ApiV3Service,
-    protected notificationService:WorkPackageNotificationService,
-    protected wpRelations:WorkPackageRelationsService,
-    protected halEvents:HalEventsService,
-    protected I18n:I18nService,
-    protected cdRef:ChangeDetectorRef,
-    protected PathHelper:PathHelperService) {
-    super();
-  }
-
   ngOnInit() {
     this.relation = this.relatedWorkPackage.relatedBy!;
 
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-create/wp-relations-create.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-create/wp-relations-create.component.ts
index 3d2c1564cd0..8316aff3efa 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-create/wp-relations-create.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-create/wp-relations-create.component.ts
@@ -1,10 +1,5 @@
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalEventsService } from 'core-app/features/hal/services/hal-events.service';
 import { WorkPackageNotificationService } from 'core-app/features/work-packages/services/notifications/work-package-notification.service';
@@ -21,6 +16,12 @@ import { WorkPackageRelationsService } from '../wp-relations.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageRelationsCreateComponent {
+  readonly I18n = inject(I18nService);
+  protected wpRelations = inject(WorkPackageRelationsService);
+  protected notificationService = inject(WorkPackageNotificationService);
+  protected halEvents = inject(HalEventsService);
+  protected cdRef = inject(ChangeDetectorRef);
+
   @Input() readonly workPackage:WorkPackageResource;
 
   public showRelationsCreateForm = false;
@@ -39,15 +40,6 @@ export class WorkPackageRelationsCreateComponent {
     addNewRelation: this.I18n.t('js.relation_buttons.add_new_relation'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    protected wpRelations:WorkPackageRelationsService,
-    protected notificationService:WorkPackageNotificationService,
-    protected halEvents:HalEventsService,
-    protected cdRef:ChangeDetectorRef,
-  ) {
-  }
-
   public onSelected(workPackage?:WorkPackageResource) {
     if (workPackage) {
       this.selectedWpId = workPackage.id!;
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-group/wp-relations-group.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-group/wp-relations-group.component.ts
index 7b1390eb61a..2cbbebb564b 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-group/wp-relations-group.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-group/wp-relations-group.component.ts
@@ -27,9 +27,7 @@
 //++
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import {
-  ChangeDetectionStrategy, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 @Component({
@@ -42,6 +40,8 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageRelationsGroupComponent {
+  readonly I18n = inject(I18nService);
+
   @HostBinding('class.attributes-group') className = true;
 
   @Input() public relatedWorkPackages:WorkPackageResource[];
@@ -63,11 +63,6 @@ export class WorkPackageRelationsGroupComponent {
     groupByRelation: this.I18n.t('js.relation_buttons.group_by_relation_type'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-  ) {
-  }
-
   public get togglerText() {
     if (this.groupByWorkPackageType) {
       return this.text.groupByRelation;
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.directive.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.directive.ts
index c7f52ec6bdf..75a54892d71 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.directive.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -49,6 +49,12 @@ import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageRelationsHierarchyComponent extends UntilDestroyedMixin implements OnInit {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() public workPackage:WorkPackageResource;
 
   @Input() public relationType:string;
@@ -65,16 +71,6 @@ export class WorkPackageRelationsHierarchyComponent extends UntilDestroyedMixin
 
   public childrenQueryProps:any;
 
-  constructor(
-    readonly apiV3Service:ApiV3Service,
-    readonly PathHelper:PathHelperService,
-    readonly I18n:I18nService,
-    readonly schemaCache:SchemaCacheService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   public text = {
     parentHeadline: this.I18n.t('js.relations_hierarchy.parent_headline'),
     childrenHeadline: this.I18n.t('js.relations_hierarchy.children_headline'),
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service.ts
index bb71ba67f38..7ba2ea95967 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.service.ts
@@ -29,7 +29,7 @@
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { States } from 'core-app/core/states/states.service';
 import { StateService } from '@uirouter/core';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { WorkPackageNotificationService } from 'core-app/features/work-packages/services/notifications/work-package-notification.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -37,14 +37,13 @@ import { HalEventsService } from 'core-app/features/hal/services/hal-events.serv
 
 @Injectable()
 export class WorkPackageRelationsHierarchyService {
-  constructor(protected $state:StateService,
-    protected states:States,
-    protected halEvents:HalEventsService,
-    protected notificationService:WorkPackageNotificationService,
-    protected pathHelper:PathHelperService,
-    protected apiV3Service:ApiV3Service) {
+  protected $state = inject(StateService);
+  protected states = inject(States);
+  protected halEvents = inject(HalEventsService);
+  protected notificationService = inject(WorkPackageNotificationService);
+  protected pathHelper = inject(PathHelperService);
+  protected apiV3Service = inject(ApiV3Service);
 
-  }
 
   public changeParent(workPackage:WorkPackageResource, parentId:string|null) {
     const payload:any = {
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.component.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.component.ts
index b256f51705a..24ba6141e12 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  Input,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { filter, throttleTime } from 'rxjs/operators';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -53,6 +44,12 @@ import { HalEventsService } from 'core-app/features/hal/services/hal-events.serv
   standalone: false,
 })
 export class WorkPackageRelationsComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit, OnDestroy {
+  private wpRelations = inject(WorkPackageRelationsService);
+  private apiV3Service = inject(ApiV3Service);
+  private halEvents = inject(HalEventsService);
+  private PathHelper = inject(PathHelperService);
+  private turboRequests = inject(TurboRequestsService);
+
   @Input() public workPackage:WorkPackageResource;
 
   @ViewChild('frameElement') readonly relationTurboFrame:ElementRef<HTMLIFrameElement>;
@@ -61,16 +58,6 @@ export class WorkPackageRelationsComponent extends UntilDestroyedMixin implement
 
   private turboFrameListener:EventListener = this.updateFrontendData.bind(this);
 
-  constructor(
-    private wpRelations:WorkPackageRelationsService,
-    private apiV3Service:ApiV3Service,
-    private halEvents:HalEventsService,
-    private PathHelper:PathHelperService,
-    private turboRequests:TurboRequestsService,
-) {
-    super();
-  }
-
   ngOnInit() {
     this.turboFrameSrc = `${this.PathHelper.staticBase}/work_packages/${this.workPackage.id}/relations_tab`;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.service.ts b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.service.ts
index 900e49258c4..c84dadaf40d 100644
--- a/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-relations/wp-relations.service.ts
@@ -1,7 +1,7 @@
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { multiInput, MultiInputState, StatesGroup } from '@openproject/reactivestates';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { StateCacheService } from 'core-app/core/apiv3/cache/state-cache.service';
@@ -26,12 +26,12 @@ export class RelationStateGroup extends StatesGroup {
 
 @Injectable()
 export class WorkPackageRelationsService extends StateCacheService<RelationsStateValue> {
-  constructor(
-    private PathHelper:PathHelperService,
-    private apiV3Service:ApiV3Service,
-    private halResource:HalResourceService,
-    readonly turboRequests:TurboRequestsService,
-  ) {
+  private PathHelper = inject(PathHelperService);
+  private apiV3Service = inject(ApiV3Service);
+  private halResource = inject(HalResourceService);
+  readonly turboRequests = inject(TurboRequestsService);
+
+  constructor() {
     super(new RelationStateGroup().relations);
   }
 
diff --git a/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts
index 089fdaaf5bb..c7d5d4a2bb1 100644
--- a/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts
+++ b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts
@@ -1,15 +1,5 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  OnInit,
-  ViewChild, AfterViewInit, OnDestroy,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild, AfterViewInit, OnDestroy, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -28,6 +18,11 @@ import { CollectionResource } from 'core-app/features/hal/resources/collection-r
   standalone: false,
 })
 export class WorkPackageReminderModalComponent extends OpModalComponent implements OnInit, AfterViewInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly actions$ = inject(ActionsService);
+  readonly apiV3Service = inject(ApiV3Service);
+
   @ViewChild('frameElement') frameElement:ElementRef<HTMLIFrameElement>;
 
   // Hide close button so it's not duplicated in primer (WP#51699)
@@ -48,16 +43,8 @@ export class WorkPackageReminderModalComponent extends OpModalComponent implemen
 
   private boundListener = this.turboSubmitEndListener.bind(this);
 
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef<HTMLElement>,
-    readonly pathHelper:PathHelperService,
-    readonly actions$:ActionsService,
-    readonly apiV3Service:ApiV3Service,
-  ) {
-    super(locals, cdRef, elementRef);
+  constructor() {
+    super();
 
     this.workPackage = this.locals.workPackage as WorkPackageResource;
     this.preset = this.locals.preset as ReminderPreset | undefined;
diff --git a/frontend/src/app/features/work-packages/components/wp-share-modal/wp-share.modal.ts b/frontend/src/app/features/work-packages/components/wp-share-modal/wp-share.modal.ts
index fe81b4d0b2b..5cb321d3730 100644
--- a/frontend/src/app/features/work-packages/components/wp-share-modal/wp-share.modal.ts
+++ b/frontend/src/app/features/work-packages/components/wp-share-modal/wp-share.modal.ts
@@ -1,15 +1,5 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -23,6 +13,10 @@ import { shareModalUpdated } from 'core-app/features/work-packages/components/wp
   standalone: false,
 })
 export class WorkPackageShareModalComponent extends OpModalComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly actions$ = inject(ActionsService);
+
   @ViewChild('frameElement') frameElement:ElementRef<HTMLIFrameElement>|undefined;
 
   // Hide close button so it's not duplicated in primer (WP#51699)
@@ -36,15 +30,8 @@ export class WorkPackageShareModalComponent extends OpModalComponent implements
     button_close: this.I18n.t('js.button_close'),
   };
 
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef<HTMLElement>,
-    readonly pathHelper:PathHelperService,
-    readonly actions$:ActionsService,
-  ) {
-    super(locals, cdRef, elementRef);
+  constructor() {
+    super();
 
     this.workPackage = this.locals.workPackage as WorkPackageResource;
     this.frameSrc = this.pathHelper.workPackageSharePath(this.workPackage.id!);
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts
index 01cb30fbf20..57c089846f9 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/activity-base.controller.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectorRef, Directive, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Directive, OnInit, inject } from '@angular/core';
 import { UIRouterGlobals } from '@uirouter/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -40,25 +40,21 @@ import { UrlHelpers } from 'core-stimulus/controllers/dynamic/work-packages/acti
 
 @Directive()
 export class ActivityPanelBaseController extends UntilDestroyedMixin implements OnInit {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly uiRouterGlobals = inject(UIRouterGlobals);
+  readonly storeService = inject(WpSingleViewService);
+  readonly browserDetector = inject(BrowserDetector);
+  readonly deviceService = inject(DeviceService);
+  readonly pathHelper = inject(PathHelperService);
+
   public workPackage:WorkPackageResource;
 
   public workPackageId:string;
 
   public turboFrameSrc:string;
 
-  constructor(
-    readonly apiV3Service:ApiV3Service,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly uiRouterGlobals:UIRouterGlobals,
-    readonly storeService:WpSingleViewService,
-    readonly browserDetector:BrowserDetector,
-    readonly deviceService:DeviceService,
-    readonly pathHelper:PathHelperService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     this.turboFrameSrc = this.buildTurboFrameSrc();
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/wp-activity.service.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/wp-activity.service.ts
index 91d333353b0..21748e04203 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/wp-activity.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/activity-panel/wp-activity.service.ts
@@ -28,17 +28,16 @@
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { WorkPackageLinkedResourceCache } from 'core-app/features/work-packages/components/wp-single-view-tabs/wp-linked-resource-cache.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 
 @Injectable()
 export class WorkPackagesActivityService extends WorkPackageLinkedResourceCache<HalResource[]> {
-  constructor(public ConfigurationService:ConfigurationService,
-    readonly timezoneService:TimezoneService) {
-    super();
-  }
+  ConfigurationService = inject(ConfigurationService);
+  readonly timezoneService = inject(TimezoneService);
+
 
   public get order() {
     return this.isReversed ? 'desc' : 'asc';
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.ts
index 9f668e02382..73a482cd7fb 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/files-tab/op-files-tab.component.ts
@@ -26,12 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -51,6 +46,12 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class WorkPackageFilesTabComponent implements OnInit {
+  private readonly i18n = inject(I18nService);
+  private readonly currentUserService = inject(CurrentUserService);
+  private readonly projectStoragesResourceService = inject(ProjectStoragesResourceService);
+  private readonly pathHelper = inject(PathHelperService);
+  private readonly turboRequests = inject(TurboRequestsService);
+
   @Input() workPackage:WorkPackageResource;
 
   text = {
@@ -67,14 +68,6 @@ export class WorkPackageFilesTabComponent implements OnInit {
 
   showAttachments:boolean;
 
-  constructor(
-    private readonly i18n:I18nService,
-    private readonly currentUserService:CurrentUserService,
-    private readonly projectStoragesResourceService:ProjectStoragesResourceService,
-    private readonly pathHelper:PathHelperService,
-    private readonly turboRequests:TurboRequestsService,
-  ) { }
-
   ngOnInit():void {
     const project = this.workPackage.project as HalResource;
     if (project.id === null) {
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.spec.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.spec.ts
index 4344381b8d4..ba6dbaf4244 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.spec.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.spec.ts
@@ -26,6 +26,12 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { TestBed } from '@angular/core/testing';
+import {
+  StateService,
+  TransitionService,
+  UIRouterGlobals,
+} from '@uirouter/core';
 import { KeepTabService } from './keep-tab.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -57,7 +63,20 @@ describe('keepTab service', () => {
       params: { tabIdentifier: 'activity' },
     };
 
-    keepTab = new KeepTabService($state, uiRouterGlobals, $transitions, pathHelper, currentProject);
+    TestBed.configureTestingModule({
+      providers: [
+        KeepTabService,
+        /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+        { provide: StateService, useValue: $state },
+        { provide: UIRouterGlobals, useValue: uiRouterGlobals },
+        { provide: TransitionService, useValue: $transitions },
+        { provide: PathHelperService, useValue: pathHelper },
+        { provide: CurrentProjectService, useValue: currentProject },
+        /* eslint-enable @typescript-eslint/no-unsafe-assignment */
+      ],
+    });
+
+    keepTab = TestBed.inject(KeepTabService);
 
     defaults = {
       showTab: 'work-packages.show.tabs',
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.ts
index d86cf6c42ae..93286856f52 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service.ts
@@ -33,24 +33,26 @@ import {
   UIRouterGlobals,
 } from '@uirouter/core';
 import { ReplaySubject } from 'rxjs';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { splitViewRoute } from 'core-app/features/work-packages/routing/split-view-routes.helper';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 
 @Injectable({ providedIn: 'root' })
 export class KeepTabService {
+  protected $state = inject(StateService);
+  protected uiRouterGlobals = inject(UIRouterGlobals);
+  protected $transitions = inject(TransitionService);
+  protected pathHelper = inject(PathHelperService);
+  protected currentProject = inject(CurrentProjectService);
+
   protected currentTab = 'overview';
 
   protected subject = new ReplaySubject<Record<string, string>>(1);
 
-  constructor(
-    protected $state:StateService,
-    protected uiRouterGlobals:UIRouterGlobals,
-    protected $transitions:TransitionService,
-    protected pathHelper:PathHelperService,
-    protected currentProject:CurrentProjectService,
-    ) {
+  constructor() {
+    const $transitions = this.$transitions;
+
     this.updateTabs();
     $transitions.onSuccess({}, (transition:Transition) => {
       this.updateTabs(transition.params('to').tabIdentifier);
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/overview-tab/overview-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/overview-tab/overview-tab.component.ts
index 8ebc7a6c611..848b9371151 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/overview-tab/overview-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/overview-tab/overview-tab.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -43,21 +43,17 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageOverviewTabComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly $state = inject(StateService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() public workPackage:WorkPackageResource;
 
   public workPackageId:string;
 
   public tabName = this.I18n.t('js.label_latest_activity');
 
-  public constructor(
-    readonly I18n:I18nService,
-    readonly $state:StateService,
-    readonly apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this.workPackageId = this.workPackage?.id || this.$state.params.workPackageId as string;
 
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/relations-tab/relations-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/relations-tab/relations-tab.component.ts
index 4d2b69fbc3d..e3f1b040ea0 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/relations-tab/relations-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/relations-tab/relations-tab.component.ts
@@ -27,7 +27,7 @@
 //++
 
 import { UIRouterGlobals } from '@uirouter/core';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -43,19 +43,15 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageRelationsTabComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly uiRouterGlobals = inject(UIRouterGlobals);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() public workPackageId?:string;
 
   @Input() public workPackage:WorkPackageResource;
 
-  public constructor(
-    readonly I18n:I18nService,
-    readonly uiRouterGlobals:UIRouterGlobals,
-    readonly apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     const { workPackageId } = this.uiRouterGlobals.params as unknown as { workPackageId:string };
     this.workPackageId = (this.workPackage.id!) || workPackageId;
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/watchers-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/watchers-tab.component.ts
index fe219032838..4889aec0550 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/watchers-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/watchers-tab.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit, inject } from '@angular/core';
 import { UIRouterGlobals } from '@uirouter/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
@@ -50,6 +50,17 @@ import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service
   standalone: false,
 })
 export class WorkPackageWatchersTabComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly elementRef = inject(ElementRef);
+  readonly wpWatchersService = inject(WorkPackageWatchersService);
+  readonly uiRouterGlobals = inject(UIRouterGlobals);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly loadingIndicator = inject(LoadingIndicatorService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly pathHelper = inject(PathHelperService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly turboRequests = inject(TurboRequestsService);
+
   @Input() public workPackage:WorkPackageResource;
 
   public workPackageId:string;
@@ -78,21 +89,6 @@ export class WorkPackageWatchersTabComponent extends UntilDestroyedMixin impleme
     },
   };
 
-  public constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    readonly wpWatchersService:WorkPackageWatchersService,
-    readonly uiRouterGlobals:UIRouterGlobals,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly loadingIndicator:LoadingIndicatorService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly pathHelper:PathHelperService,
-    readonly apiV3Service:ApiV3Service,
-    readonly turboRequests:TurboRequestsService,
-  ) {
-    super();
-  }
-
   public ngOnInit() {
     this.element = this.elementRef.nativeElement;
     const { workPackageId } = this.uiRouterGlobals.params as unknown as { workPackageId:string };
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/wp-watcher-entry.component.ts b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/wp-watcher-entry.component.ts
index 1315b29b2d3..b5da0555b0d 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/wp-watcher-entry.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view-tabs/watchers-tab/wp-watcher-entry.component.ts
@@ -26,12 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { UserResource } from 'core-app/features/hal/resources/user-resource';
 import { WorkPackageWatchersTabComponent } from './watchers-tab.component';
@@ -44,14 +39,13 @@ import { WorkPackageWatchersTabComponent } from './watchers-tab.component';
   standalone: false,
 })
 export class WorkPackageWatcherEntryComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly panelCtrl = inject(WorkPackageWatchersTabComponent);
+
   @Input() public watcher:UserResource;
 
   public text:{ remove:string };
 
-  constructor(readonly I18n:I18nService,
-    readonly panelCtrl:WorkPackageWatchersTabComponent) {
-  }
-
   ngOnInit():void {
     this.text = {
       remove: this.I18n.t('js.label_remove_watcher', { name: this.watcher.name }),
diff --git a/frontend/src/app/features/work-packages/components/wp-single-view/wp-single-view.component.ts b/frontend/src/app/features/work-packages/components/wp-single-view/wp-single-view.component.ts
index 9ebbde7098e..ca4533f1b34 100644
--- a/frontend/src/app/features/work-packages/components/wp-single-view/wp-single-view.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-single-view/wp-single-view.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Injector,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector, Input, OnInit, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { distinctUntilChanged, first, map } from 'rxjs/operators';
@@ -99,6 +91,23 @@ export const overflowingContainerAttribute = 'overflowingIdentifier';
   standalone: false,
 })
 export class WorkPackageSingleViewComponent extends UntilDestroyedMixin implements OnInit {
+  protected readonly injector = inject(Injector);
+  private readonly states = inject(States);
+  private readonly I18n = inject(I18nService);
+  private readonly hook = inject(HookService);
+  private readonly $state = inject(StateService);
+  private readonly elementRef = inject(ElementRef);
+  private readonly cdRef = inject(ChangeDetectorRef);
+  private readonly PathHelper = inject(PathHelperService);
+  private readonly schemaCache = inject(SchemaCacheService);
+  private readonly currentProject = inject(CurrentProjectService);
+  private readonly halEditing = inject(HalResourceEditingService);
+  private readonly halResourceService = inject(HalResourceService);
+  private readonly currentUserService = inject(CurrentUserService);
+  private readonly displayFieldService = inject(DisplayFieldService);
+  private readonly projectsResourceService = inject(ProjectsResourceService);
+  private readonly projectStoragesService = inject(ProjectStoragesResourceService);
+
   @Input() public workPackage:WorkPackageResource;
 
   /** Should we show the project field */
@@ -145,27 +154,6 @@ export class WorkPackageSingleViewComponent extends UntilDestroyedMixin implemen
 
   projectStorages = new BehaviorSubject<IProjectStorage[]>([]);
 
-  constructor(
-    protected readonly injector:Injector,
-    private readonly states:States,
-    private readonly I18n:I18nService,
-    private readonly hook:HookService,
-    private readonly $state:StateService,
-    private readonly elementRef:ElementRef,
-    private readonly cdRef:ChangeDetectorRef,
-    private readonly PathHelper:PathHelperService,
-    private readonly schemaCache:SchemaCacheService,
-    private readonly currentProject:CurrentProjectService,
-    private readonly halEditing:HalResourceEditingService,
-    private readonly halResourceService:HalResourceService,
-    private readonly currentUserService:CurrentUserService,
-    private readonly displayFieldService:DisplayFieldService,
-    private readonly projectsResourceService:ProjectsResourceService,
-    private readonly projectStoragesService:ProjectStoragesResourceService,
-  ) {
-    super();
-  }
-
   public ngOnInit():void {
     this.element = this.elementRef.nativeElement as HTMLElement;
 
diff --git a/frontend/src/app/features/work-packages/components/wp-subject/wp-subject.component.ts b/frontend/src/app/features/work-packages/components/wp-subject/wp-subject.component.ts
index 121c81957a2..9881e8271d6 100644
--- a/frontend/src/app/features/work-packages/components/wp-subject/wp-subject.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-subject/wp-subject.component.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { UIRouterGlobals } from '@uirouter/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { randomString } from 'core-app/shared/helpers/random-string';
@@ -47,14 +43,10 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageSubjectComponent extends UntilDestroyedMixin {
+  protected uiRouterGlobals = inject(UIRouterGlobals);
+  protected apiV3Service = inject(ApiV3Service);
+
   @Input() workPackage:WorkPackageResource;
 
   public readonly uniqueElementIdentifier = `work-packages--subject-type-row-${randomString(16)}`;
-
-  constructor(
-    protected uiRouterGlobals:UIRouterGlobals,
-    protected apiV3Service:ApiV3Service,
-  ) {
-    super();
-  }
 }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/config-menu/config-menu.component.ts b/frontend/src/app/features/work-packages/components/wp-table/config-menu/config-menu.component.ts
index 75f67ec7be8..d4c289f3388 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/config-menu/config-menu.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/config-menu/config-menu.component.ts
@@ -1,5 +1,5 @@
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, inject } from '@angular/core';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { WpTableConfigurationModalComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.modal';
@@ -14,17 +14,15 @@ import { WpTableConfigurationModalComponent } from 'core-app/features/work-packa
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackagesTableConfigMenuComponent {
+  readonly I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly opModalService = inject(OpModalService);
+  readonly opContextMenu = inject(OPContextMenuService);
+
   public text = {
     configureTable: this.I18n.t('js.toolbar.settings.configure_view'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly injector:Injector,
-    readonly opModalService:OpModalService,
-    readonly opContextMenu:OPContextMenuService,
-  ) { }
-
   public openTableConfigurationModal() {
     this.opContextMenu.close();
     this.opModalService.show(WpTableConfigurationModalComponent, this.injector);
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/columns-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/columns-tab.component.ts
index afadf97d491..613929cc229 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/columns-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/columns-tab.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { QueryColumn } from 'core-app/features/work-packages/components/wp-query/query-column';
 import {
@@ -20,6 +20,10 @@ import {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTableConfigurationColumnsTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+
   public availableColumnsOptions = this.wpTableColumns.all.map((c) => this.column2Like(c));
 
   public availableColumns = this.wpTableColumns.all;
@@ -40,13 +44,6 @@ export class WpTableConfigurationColumnsTabComponent implements TabComponent, On
     inputDragLabel: this.I18n.t('js.label_manage_columns'),
   };
 
-  constructor(
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-) {
-  }
-
   public onSave() {
     this.wpTableColumns.setColumnsById(this.selectedColumns.map((c) => c.id));
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/display-settings-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/display-settings-tab.component.ts
index 3526c27874d..a173cea748c 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/display-settings-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/display-settings-tab.component.ts
@@ -3,7 +3,7 @@ import { TabComponent } from 'core-app/features/work-packages/components/wp-tabl
 import { WorkPackageViewGroupByService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service';
 import { WorkPackageViewHierarchiesService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-hierarchy.service';
 import { WorkPackageViewSumService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-sum.service';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnInit, inject } from '@angular/core';
 import { QueryGroupByResource } from 'core-app/features/hal/resources/query-group-by-resource';
 
 @Component({
@@ -16,6 +16,13 @@ import { QueryGroupByResource } from 'core-app/features/hal/resources/query-grou
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTableConfigurationDisplaySettingsTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly wpTableGroupBy = inject(WorkPackageViewGroupByService);
+  readonly wpTableHierarchies = inject(WorkPackageViewHierarchiesService);
+  readonly wpTableSums = inject(WorkPackageViewSumService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   // Display mode
   public displayMode:'hierarchy'|'grouped'|'default' = 'default';
 
@@ -44,15 +51,6 @@ export class WpTableConfigurationDisplaySettingsTabComponent implements TabCompo
     },
   };
 
-  constructor(
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly wpTableGroupBy:WorkPackageViewGroupByService,
-    readonly wpTableHierarchies:WorkPackageViewHierarchiesService,
-    readonly wpTableSums:WorkPackageViewSumService,
-    readonly cdRef:ChangeDetectorRef,
-  ) { }
-
   public onSave() {
     // Update hierarchy state
     this.wpTableHierarchies.setEnabled(this.displayMode === 'hierarchy');
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/filters-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/filters-tab.component.ts
index 0af78ae3c7b..b672fee06f1 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/filters-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/filters-tab.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   TabComponent,
@@ -19,6 +19,11 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
   standalone: false,
 })
 export class WpTableConfigurationFiltersTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpFiltersService = inject(WorkPackageFiltersService);
+
   public filters:QueryFilterInstanceResource[] = [];
 
   public eeShowBanners = false;
@@ -32,14 +37,6 @@ export class WpTableConfigurationFiltersTabComponent implements TabComponent, On
     upsellRelationColumnsLink: this.I18n.t('js.modals.upsell_relation_columns_link'),
   };
 
-  constructor(
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpFiltersService:WorkPackageFiltersService,
-  ) {
-  }
-
   ngOnInit() {
     this.wpTableFilters
       .onReady()
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.ts
index c719ba6b6cd..d3e54352107 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Injector,
-  ViewChild, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, ViewChild, OnInit, inject } from '@angular/core';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
 import { WorkPackageViewHighlightingService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -22,6 +17,13 @@ import { repositionDropdownBugfix } from 'core-app/shared/components/autocomplet
   standalone: false,
 })
 export class WpTableConfigurationHighlightingTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly states = inject(States);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly Banners = inject(BannersService);
+  readonly wpTableHighlight = inject(WorkPackageViewHighlightingService);
+
   // Display mode
   public highlightingMode:HighlightingMode = 'inline';
 
@@ -54,14 +56,6 @@ export class WpTableConfigurationHighlightingTabComponent implements TabComponen
     more_info_link: enterpriseDocsUrl.tableHighlighting,
   };
 
-  constructor(readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly Banners:BannersService,
-    readonly wpTableHighlight:WorkPackageViewHighlightingService) {
-  }
-
   ngOnInit() {
     this.availableInlineHighlightedAttributes = this.availableHighlightedAttributes;
     this.availableRowHighlightedAttributes = [
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/sort-by-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/sort-by-tab.component.ts
index aa35a7696cf..8a5f49122cf 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/sort-by-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/sort-by-tab.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewSortByService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-sort-by.service';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
@@ -30,6 +30,11 @@ export type SortingMode = 'automatic'|'manual';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTableConfigurationSortByTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly wpTableSortBy = inject(WorkPackageViewSortByService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   public text = {
     title: this.I18n.t('js.label_sort_by'),
     placeholder: this.I18n.t('js.placeholders.default'),
@@ -61,13 +66,6 @@ export class WpTableConfigurationSortByTabComponent implements TabComponent, OnI
 
   public manualSortColumn:SortColumn;
 
-  constructor(readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly wpTableSortBy:WorkPackageViewSortByService,
-    readonly cdRef:ChangeDetectorRef) {
-
-  }
-
   public onSave() {
     let sortElements;
     if (this.sortingMode === 'automatic') {
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/timelines-tab.component.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/timelines-tab.component.ts
index 0d8e8618b26..5092244b5da 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/timelines-tab.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/timelines-tab.component.ts
@@ -1,9 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Injector,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
 import { WorkPackageViewTimelineService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service';
@@ -22,6 +17,12 @@ import { StateService } from '@uirouter/angular';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTableConfigurationTimelinesTabComponent implements TabComponent, OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly wpTableTimeline = inject(WorkPackageViewTimelineService);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly $state = inject(StateService);
+
   public timelineVisible = false;
 
   public availableAttributes:{ id:string, name:string }[];
@@ -61,15 +62,6 @@ export class WpTableConfigurationTimelinesTabComponent implements TabComponent,
     },
   };
 
-  constructor(
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly wpTableTimeline:WorkPackageViewTimelineService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly $state:StateService,
-  ) {
-  }
-
   public onSave() {
     this.wpTableTimeline.update({
       ...this.wpTableTimeline.current,
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.html b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.html
index 4884b2d01a8..1b4f42fd1cb 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.html
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.html
@@ -3,6 +3,7 @@
     <span [textContent]="text.filter_work_packages_by_relation_type"></span>
     &ngsp;
     <select class="form--select form--inline-select"
+      data-test-selector="wp-table-configuration-relation-filter"
       [(ngModel)]="selectedRelationFilter"
       (ngModelChange)="onRelationFilterSelected()"
       [compareWith]="compareRelationFilters">
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.ts
index e4effd2709a..9fd53229297 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration-relation-selector.ts
@@ -1,10 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Injector,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnInit, inject } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewFiltersService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
@@ -24,6 +18,13 @@ import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTableConfigurationRelationSelectorComponent implements OnInit {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly ConfigurationService = inject(ConfigurationService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   private relationFilterIds:string[] = [
     'parent',
     'precedes',
@@ -62,14 +63,6 @@ export class WpTableConfigurationRelationSelectorComponent implements OnInit {
     includes: this.I18n.t('js.relation_labels.partof'),
   };
 
-  constructor(readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly ConfigurationService:ConfigurationService,
-    readonly schemaCache:SchemaCacheService,
-    readonly cdRef:ChangeDetectorRef) {
-  }
-
   ngOnInit() {
     void this.initializeRelationFilters();
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.modal.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.modal.ts
index d6f4a718a94..63c7624979f 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.modal.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.modal.ts
@@ -1,19 +1,4 @@
-import {
-  ApplicationRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ComponentFactoryResolver,
-  ElementRef,
-  EventEmitter,
-  Inject,
-  InjectionToken,
-  Injector,
-  OnDestroy,
-  OnInit,
-  Optional,
-  ViewChild,
-} from '@angular/core';
+import { ApplicationRef, ChangeDetectionStrategy, Component, ComponentFactoryResolver, ElementRef, EventEmitter, InjectionToken, Injector, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { WorkPackageViewColumnsService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-columns.service';
 import { WpTableConfigurationService } from 'core-app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service';
@@ -27,9 +12,7 @@ import { WorkPackageStatesInitializationService } from 'core-app/features/work-p
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { LoadingIndicatorService } from 'core-app/core/loading-indicator/loading-indicator.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { ComponentType } from '@angular/cdk/portal';
 import { WorkPackageNotificationService } from 'core-app/features/work-packages/services/notifications/work-package-notification.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -48,6 +31,20 @@ export const WpTableConfigurationModalPrependToken = new InjectionToken<Componen
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTableConfigurationModalComponent extends OpModalComponent implements OnInit, OnDestroy {
+  prependModalComponent = inject<ComponentType<unknown> | null>(WpTableConfigurationModalPrependToken, { optional: true });
+  readonly I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly appRef = inject(ApplicationRef);
+  readonly componentFactoryResolver = inject(ComponentFactoryResolver);
+  readonly loadingIndicator = inject(LoadingIndicatorService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpStatesInitialization = inject(WorkPackageStatesInitializationService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly ConfigurationService = inject(ConfigurationService);
+  readonly $state = inject(StateService);
+
   public text = {
     title: this.I18n.t('js.work_packages.table_configuration.modal_title'),
     closePopup: this.I18n.t('js.close_popup_title'),
@@ -74,28 +71,7 @@ export class WpTableConfigurationModalComponent extends OpModalComponent impleme
 
   // Try to load an optional provided configuration service, and fall back to the default one
   private wpTableConfigurationService:WpTableConfigurationService =
-  this.injector.get(WpTableConfigurationService, new WpTableConfigurationService(this.I18n, this.$state));
-
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    @Optional() @Inject(WpTableConfigurationModalPrependToken) public prependModalComponent:ComponentType<any>|null,
-    readonly I18n:I18nService,
-    readonly injector:Injector,
-    readonly appRef:ApplicationRef,
-    readonly componentFactoryResolver:ComponentFactoryResolver,
-    readonly loadingIndicator:LoadingIndicatorService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpStatesInitialization:WorkPackageStatesInitializationService,
-    readonly apiV3Service:ApiV3Service,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly ConfigurationService:ConfigurationService,
-    readonly elementRef:ElementRef,
-    readonly $state:StateService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
+  this.injector.get(WpTableConfigurationService);
 
   ngOnInit() {
     this.element = this.elementRef.nativeElement as HTMLElement;
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service.ts b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service.ts
index 141691f9d66..b400562b93b 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WpTableConfigurationDisplaySettingsTabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tabs/display-settings-tab.component';
 import { TabInterface } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
@@ -10,8 +10,11 @@ import { WpTableConfigurationHighlightingTabComponent } from 'core-app/features/
 import { OpBaselineComponent } from 'core-app/features/work-packages/components/wp-baseline/baseline/baseline.component';
 import { StateService } from '@uirouter/angular';
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class WpTableConfigurationService {
+  readonly I18n = inject(I18nService);
+  readonly $state = inject(StateService);
+
   protected _tabs:TabInterface[] = [
     {
       id: 'columns',
@@ -45,12 +48,6 @@ export class WpTableConfigurationService {
     },
   ];
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly $state:StateService,
-  ) {
-  }
-
   public get tabs() {
     if (this.$state.current.name?.includes('work-packages') || this.$state.current.name?.includes('bim')) {
       return this._tabs;
diff --git a/frontend/src/app/features/work-packages/components/wp-table/context-menu-helper/wp-context-menu-helper.service.ts b/frontend/src/app/features/work-packages/components/wp-table/context-menu-helper/wp-context-menu-helper.service.ts
index a5904b73479..6a186f1b581 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/context-menu-helper/wp-context-menu-helper.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/context-menu-helper/wp-context-menu-helper.service.ts
@@ -27,7 +27,7 @@
 //++
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { HalLink } from 'core-app/features/hal/hal-link/hal-link';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
 import { HookService } from 'core-app/features/plugins/hook-service';
@@ -47,6 +47,13 @@ export interface WorkPackageAction {
 
 @Injectable()
 export class WorkPackageContextMenuHelperService {
+  private HookService = inject(HookService);
+  private UrlParamsHelper = inject(UrlParamsHelperService);
+  private wpViewRepresentation = inject(WorkPackageViewDisplayRepresentationService);
+  private wpViewTimeline = inject(WorkPackageViewTimelineService);
+  private wpViewIndent = inject(WorkPackageViewHierarchyIdentationService);
+  private PathHelper = inject(PathHelperService);
+
   private BULK_ACTIONS = [
     {
       text: I18n.t('js.work_packages.bulk_actions.edit'),
@@ -74,14 +81,6 @@ export class WorkPackageContextMenuHelperService {
     },
   ];
 
-  constructor(private HookService:HookService,
-    private UrlParamsHelper:UrlParamsHelperService,
-    private wpViewRepresentation:WorkPackageViewDisplayRepresentationService,
-    private wpViewTimeline:WorkPackageViewTimelineService,
-    private wpViewIndent:WorkPackageViewHierarchyIdentationService,
-    private PathHelper:PathHelperService) {
-  }
-
   public getPermittedActionLinks(workPackage:WorkPackageResource, permittedActionConstants:any, allowSplitScreenActions:boolean):WorkPackageAction[] {
     const singularPermittedActions:any[] = [];
 
diff --git a/frontend/src/app/features/work-packages/components/wp-table/embedded/embedded-tables-macro.component.ts b/frontend/src/app/features/work-packages/components/wp-table/embedded/embedded-tables-macro.component.ts
index 04dffe12beb..70ce4a6924d 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/embedded/embedded-tables-macro.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/embedded/embedded-tables-macro.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
 import {
   WorkPackageTableConfigurationObject,
 } from 'core-app/features/work-packages/components/wp-table/wp-table-configuration';
@@ -44,6 +44,8 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class EmbeddedTablesMacroComponent {
+  readonly elementRef = inject(ElementRef);
+
   @Input() public queryProps:object;
 
   public configuration:WorkPackageTableConfigurationObject = {
@@ -52,9 +54,7 @@ export class EmbeddedTablesMacroComponent {
     contextMenuEnabled: false,
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/embedded/wp-embedded-table-entry.component.ts b/frontend/src/app/features/work-packages/components/wp-table/embedded/wp-embedded-table-entry.component.ts
index 629b5d22e37..67c633547ab 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/embedded/wp-embedded-table-entry.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/embedded/wp-embedded-table-entry.component.ts
@@ -1,6 +1,4 @@
-import {
-  ChangeDetectionStrategy, Component, ElementRef, Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
@@ -23,13 +21,15 @@ export const wpTableEntrySelector = 'wp-embedded-table-entry';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageEmbeddedTableEntryComponent {
+  readonly elementRef = inject(ElementRef);
+
   @Input() public queryProps:unknown;
 
   @Input() public configuration:unknown;
 
   @Input() public initialLoadingIndicator = true;
 
-  constructor(readonly elementRef:ElementRef) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.component.ts b/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.component.ts
index b626f4afdb6..acc8637ff07 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.component.ts
@@ -1,9 +1,10 @@
 import {
-  AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit, ViewChild,
+  AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit, ViewChild,
 } from '@angular/core';
 import { WorkPackageEmbeddedTableComponent } from 'core-app/features/work-packages/components/wp-table/embedded/wp-embedded-table.component';
 import { WpTableConfigurationService } from 'core-app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service';
 import { RestrictedWpTableConfigurationService } from 'core-app/features/work-packages/components/wp-table/external-configuration/restricted-wp-table-configuration.service';
+import { ExternalQueryConfigurationService } from 'core-app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.service';
 import { OpQueryConfigurationLocalsToken } from 'core-app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.constants';
 import { UrlParamsHelperService } from 'core-app/features/work-packages/components/wp-query/url-params-helper';
 import {
@@ -11,11 +12,11 @@ import {
 } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
 
 export interface QueryConfigurationLocals {
-  service:any;
-  currentQuery:any;
+  service:ExternalQueryConfigurationService;
+  currentQuery:unknown;
   urlParams?:boolean;
   disabledTabs?:Record<string, string>;
-  callback:(newQuery:any) => void;
+  callback:(newQuery:unknown) => void;
 }
 
 @Component({
@@ -31,18 +32,18 @@ export interface QueryConfigurationLocals {
 export class ExternalQueryConfigurationComponent implements OnInit, AfterViewInit {
   @ViewChild('embeddedTableForConfiguration', { static: true }) private embeddedTable:WorkPackageEmbeddedTableComponent;
 
-  queryProps:string|object;
+  readonly locals = inject<QueryConfigurationLocals>(OpQueryConfigurationLocalsToken);
+  readonly urlParamsHelper = inject(UrlParamsHelperService);
+  readonly cdRef = inject(ChangeDetectorRef);
 
-  constructor(@Inject(OpQueryConfigurationLocalsToken) readonly locals:QueryConfigurationLocals,
-    readonly urlParamsHelper:UrlParamsHelperService,
-    readonly cdRef:ChangeDetectorRef) {
-  }
+  queryProps:string|object;
 
   ngOnInit() {
     if (this.locals.urlParams) {
-      this.queryProps = this.urlParamsHelper.buildV3GetQueryFromJsonParams(this.locals.currentQuery);
+      const currentQuery = typeof this.locals.currentQuery === 'string' ? this.locals.currentQuery : null;
+      this.queryProps = this.urlParamsHelper.buildV3GetQueryFromJsonParams(currentQuery);
     } else {
-      this.queryProps = this.locals.currentQuery as string;
+      this.queryProps = this.locals.currentQuery as object;
     }
   }
 
@@ -50,19 +51,24 @@ export class ExternalQueryConfigurationComponent implements OnInit, AfterViewIni
     // Open the configuration modal in an asynchronous step
     // to avoid nesting components in the view initialization.
     setTimeout(() => {
-      this.embeddedTable.openConfigurationModal(() => {
-        this.service.detach();
-        if (this.locals.urlParams) {
-          this.locals.callback(this.embeddedTable.buildUrlParams());
-        } else {
-          this.locals.callback(this.embeddedTable.buildQueryProps());
-        }
+      void this.embeddedTable.openConfigurationModal(() => {
+        // The modal emits onDataUpdated immediately after tab onSave hooks run.
+        // Defer reading query props by a tick so the embedded query space reflects
+        // the latest filter/column changes before we persist them in form configuration.
+        setTimeout(() => {
+          this.service.detach();
+          if (this.locals.urlParams) {
+            this.locals.callback(this.embeddedTable.buildUrlParams());
+          } else {
+            this.locals.callback(this.embeddedTable.buildQueryProps());
+          }
+        });
       });
       this.cdRef.detectChanges();
     });
   }
 
-  public get service():any {
+  public get service():ExternalQueryConfigurationService {
     return this.locals.service;
   }
 }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.service.ts b/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.service.ts
index d9ab83de384..bb731009f33 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.service.ts
@@ -1,6 +1,4 @@
-import {
-  ApplicationRef, ComponentFactoryResolver, Injectable, Injector,
-} from '@angular/core';
+import { ApplicationRef, Injectable, Injector, inject } from '@angular/core';
 import { ComponentPortal, DomPortalOutlet } from '@angular/cdk/portal';
 import { TransitionService } from '@uirouter/core';
 import { FocusHelperService } from 'core-app/shared/directives/focus/focus-helper';
@@ -14,19 +12,17 @@ export type Class = new(...args:any[]) => any;
 
 @Injectable()
 export class ExternalQueryConfigurationService {
+  readonly FocusHelper = inject(FocusHelperService);
+  private appRef = inject(ApplicationRef);
+  private $transitions = inject(TransitionService);
+  private injector = inject(Injector);
+
   // Hold a reference to the DOM node we're using as a host
   private _portalHostElement:HTMLElement;
 
   // And a reference to the actual portal host interface on top of the element
   private _bodyPortalHost:DomPortalOutlet;
 
-  constructor(
-    readonly FocusHelper:FocusHelperService,
-    private appRef:ApplicationRef,
-    private $transitions:TransitionService,
-    private injector:Injector) {
-  }
-
   /**
    * Create a portal host element to contain the table configuration components.
    */
diff --git a/frontend/src/app/features/work-packages/components/wp-table/external-configuration/restricted-wp-table-configuration.service.ts b/frontend/src/app/features/work-packages/components/wp-table/external-configuration/restricted-wp-table-configuration.service.ts
index d1b91c01a0a..777f6cee357 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/external-configuration/restricted-wp-table-configuration.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/external-configuration/restricted-wp-table-configuration.service.ts
@@ -1,20 +1,12 @@
-import { Inject, Injectable } from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { Injectable, inject } from '@angular/core';
 import { TabInterface } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
 import { WpTableConfigurationService } from 'core-app/features/work-packages/components/wp-table/configuration-modal/wp-table-configuration.service';
 import { QueryConfigurationLocals } from 'core-app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.component';
 import { OpQueryConfigurationLocalsToken } from 'core-app/features/work-packages/components/wp-table/external-configuration/external-query-configuration.constants';
-import { StateService } from '@uirouter/angular';
 
 @Injectable()
 export class RestrictedWpTableConfigurationService extends WpTableConfigurationService {
-  constructor(
-    @Inject(OpQueryConfigurationLocalsToken) readonly locals:QueryConfigurationLocals,
-    readonly I18n:I18nService,
-    readonly $state:StateService,
-  ) {
-    super(I18n, $state);
-  }
+  readonly locals = inject<QueryConfigurationLocals>(OpQueryConfigurationLocalsToken);
 
   public get tabs():TabInterface[] {
     const disabledTabs = this.locals.disabledTabs || {};
diff --git a/frontend/src/app/features/work-packages/components/wp-table/sort-header/sort-header.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/sort-header/sort-header.directive.ts
index b18e3ba573b..4dd50182efe 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/sort-header/sort-header.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/sort-header/sort-header.directive.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit, ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Input,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   QueryColumn, queryColumnTypes,
@@ -61,6 +55,15 @@ import { WorkPackageViewBaselineService } from 'core-app/features/work-packages/
 })
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class SortHeaderDirective extends UntilDestroyedMixin implements AfterViewInit {
+  private wpTableHierarchies = inject(WorkPackageViewHierarchiesService);
+  private wpTableSortBy = inject(WorkPackageViewSortByService);
+  private wpTableGroupBy = inject(WorkPackageViewGroupByService);
+  private wpTableBaseline = inject(WorkPackageViewBaselineService);
+  private wpTableRelationColumns = inject(WorkPackageViewRelationColumnsService);
+  private elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  private cdRef = inject(ChangeDetectorRef);
+  private I18n = inject(I18nService);
+
   @Input() headerColumn:QueryColumn;
 
   @Input() locale:string;
@@ -91,19 +94,6 @@ export class SortHeaderDirective extends UntilDestroyedMixin implements AfterVie
 
   private currentSortDirection:QuerySortByDirection|null;
 
-  constructor(
-    private wpTableHierarchies:WorkPackageViewHierarchiesService,
-    private wpTableSortBy:WorkPackageViewSortByService,
-    private wpTableGroupBy:WorkPackageViewGroupByService,
-    private wpTableBaseline:WorkPackageViewBaselineService,
-    private wpTableRelationColumns:WorkPackageViewRelationColumnsService,
-    private elementRef:ElementRef<HTMLElement>,
-    private cdRef:ChangeDetectorRef,
-    private I18n:I18nService,
-  ) {
-    super();
-  }
-
   ngAfterViewInit() {
     setTimeout(() => this.initialize());
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-table/table-actions/table-actions.service.ts b/frontend/src/app/features/work-packages/components/wp-table/table-actions/table-actions.service.ts
index 2c927c6bad6..9a2f1fa75a3 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/table-actions/table-actions.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/table-actions/table-actions.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import {
   OpTableActionFactory,
 } from 'core-app/features/work-packages/components/wp-table/table-actions/table-action';
@@ -8,8 +8,8 @@ import { WorkPackageResource } from 'core-app/features/hal/resources/work-packag
 
 @Injectable()
 export class OpTableActionsService {
-  constructor(private readonly injector:Injector) {
-  }
+  private readonly injector = inject(Injector);
+
 
   /**
    * Actions currently registered
diff --git a/frontend/src/app/features/work-packages/components/wp-table/table-pagination/wp-table-pagination.component.ts b/frontend/src/app/features/work-packages/components/wp-table/table-pagination/wp-table-pagination.component.ts
index aaae51d4bca..296f2c2ade6 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/table-pagination/wp-table-pagination.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/table-pagination/wp-table-pagination.component.ts
@@ -26,16 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, inject } from '@angular/core';
 import { combineLatest } from 'rxjs';
 
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   WorkPackageViewPaginationService,
 } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-pagination.service';
@@ -48,7 +41,6 @@ import {
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { WorkPackageCollectionResource } from 'core-app/features/hal/resources/wp-collection-resource';
 import { TablePaginationComponent } from 'core-app/shared/components/table-pagination/table-pagination.component';
-import { PaginationService } from 'core-app/shared/components/table-pagination/pagination-service';
 
 @Component({
   templateUrl: '../../../../../shared/components/table-pagination/table-pagination.component.html',
@@ -57,16 +49,9 @@ import { PaginationService } from 'core-app/shared/components/table-pagination/p
   standalone: false,
 })
 export class WorkPackageTablePaginationComponent extends TablePaginationComponent implements OnInit, OnDestroy {
-  constructor(
-    protected paginationService:PaginationService,
-    protected cdRef:ChangeDetectorRef,
-    protected wpTablePagination:WorkPackageViewPaginationService,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpTableSortBy:WorkPackageViewSortByService,
-    readonly I18n:I18nService,
-  ) {
-    super(paginationService, cdRef, I18n);
-  }
+  protected wpTablePagination = inject(WorkPackageViewPaginationService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpTableSortBy = inject(WorkPackageViewSortByService);
 
   ngOnInit() {
     super.ngOnInit();
@@ -110,7 +95,7 @@ export class WorkPackageTablePaginationComponent extends TablePaginationComponen
 
   public paginationInfoText(work_packages:WorkPackageCollectionResource) {
     if (this.isManualSortingMode && (work_packages.count < work_packages.total)) {
-      return I18n.t('js.work_packages.limited_results',
+      return this.I18n.t('js.work_packages.limited_results',
         { count: work_packages.count });
     }
     return undefined;
diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/container/wp-timeline-container.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/container/wp-timeline-container.directive.ts
index 9e4e34a7982..7025c3852e9 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/container/wp-timeline-container.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/container/wp-timeline-container.directive.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  Injector,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Injector, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   IToast,
@@ -101,6 +95,22 @@ import { IDay } from 'core-app/core/state/days/day.model';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageTimelineTableController extends UntilDestroyedMixin implements AfterViewInit {
+  readonly injector = inject(Injector);
+  private elementRef = inject(ElementRef);
+  private states = inject(States);
+  wpTableComponent = inject(WorkPackagesTableComponent);
+  private toastService = inject(ToastService);
+  private wpTableTimeline = inject(WorkPackageViewTimelineService);
+  private notificationService = inject(WorkPackageNotificationService);
+  private wpRelations = inject(WorkPackageRelationsService);
+  private wpTableHierarchies = inject(WorkPackageViewHierarchiesService);
+  private halEvents = inject(HalEventsService);
+  private querySpace = inject(IsolatedQuerySpace);
+  readonly I18n = inject(I18nService);
+  private workPackageViewCollapsedGroupsService = inject(WorkPackageViewCollapsedGroupsService);
+  private weekdaysService = inject(WeekdayService);
+  private daysService = inject(DayResourceService);
+
   private element:HTMLElement;
 
   public workPackageTable:WorkPackageTable;
@@ -149,26 +159,6 @@ export class WorkPackageTimelineTableController extends UntilDestroyedMixin impl
     return workPackagesWithGroupHeaderCell;
   }
 
-  constructor(
-    public readonly injector:Injector,
-    private elementRef:ElementRef,
-    private states:States,
-    public wpTableComponent:WorkPackagesTableComponent,
-    private toastService:ToastService,
-    private wpTableTimeline:WorkPackageViewTimelineService,
-    private notificationService:WorkPackageNotificationService,
-    private wpRelations:WorkPackageRelationsService,
-    private wpTableHierarchies:WorkPackageViewHierarchiesService,
-    private halEvents:HalEventsService,
-    private querySpace:IsolatedQuerySpace,
-    readonly I18n:I18nService,
-    private workPackageViewCollapsedGroupsService:WorkPackageViewCollapsedGroupsService,
-    private weekdaysService:WeekdayService,
-    private daysService:DayResourceService,
-  ) {
-    super();
-  }
-
   ngAfterViewInit() {
     this.element = this.elementRef.nativeElement;
 
diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts
index ca8fd1e5948..ea8b916d918 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, Component, ElementRef, Injector, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Injector, OnInit, inject } from '@angular/core';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { State } from '@openproject/reactivestates';
 import { combineLatest } from 'rxjs';
@@ -87,21 +85,19 @@ function newSegment(vp:TimelineViewParameters,
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageTableTimelineRelations extends UntilDestroyedMixin implements OnInit {
+  readonly injector = inject(Injector);
+  elementRef = inject(ElementRef);
+  states = inject(States);
+  workPackageTimelineTableController = inject(WorkPackageTimelineTableController);
+  wpTableTimeline = inject(WorkPackageViewTimelineService);
+  wpRelations = inject(WorkPackageRelationsService);
+
   @InjectField() querySpace:IsolatedQuerySpace;
 
   private container:HTMLElement;
 
   private workPackagesWithRelations:Record<string, RelationsStateValue> = {};
 
-  constructor(public readonly injector:Injector,
-              public elementRef:ElementRef,
-              public states:States,
-              public workPackageTimelineTableController:WorkPackageTimelineTableController,
-              public wpTableTimeline:WorkPackageViewTimelineService,
-              public wpRelations:WorkPackageRelationsService) {
-    super();
-  }
-
   ngOnInit() {
     const element = this.elementRef.nativeElement;
     this.container = element.querySelector('.wp-table-timeline--relations');
diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-static-elements.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-static-elements.directive.ts
index 1d384759303..90f77856db5 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-static-elements.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-static-elements.directive.ts
@@ -25,12 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, inject } from '@angular/core';
 import { States } from 'core-app/core/states/states.service';
 import { WorkPackageTimelineTableController } from '../container/wp-timeline-container.directive';
 import { calculatePositionValueForDayCountingPx, TimelineViewParameters } from '../wp-timeline';
@@ -50,15 +45,18 @@ import { TodayLineElement } from './wp-timeline.today-line';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageTableTimelineStaticElements implements OnInit {
+  states = inject(States);
+  workPackageTimelineTableController = inject(WorkPackageTimelineTableController);
+
   public element:HTMLElement;
 
   private container:HTMLElement;
 
   private elements:TimelineStaticElement[];
 
-  constructor(elementRef:ElementRef,
-    public states:States,
-    public workPackageTimelineTableController:WorkPackageTimelineTableController) {
+  constructor() {
+    const elementRef = inject(ElementRef);
+
     this.element = elementRef.nativeElement;
 
     this.elements = [
diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/grid/wp-timeline-grid.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/grid/wp-timeline-grid.directive.ts
index 44aa2768c37..abd945c1726 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/grid/wp-timeline-grid.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/grid/wp-timeline-grid.directive.ts
@@ -25,12 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, inject } from '@angular/core';
 import moment, { Moment } from 'moment';
 import { TimelineZoomLevel } from 'core-app/features/hal/resources/query-resource';
 import { WorkPackageTimelineTableController } from '../container/wp-timeline-container.directive';
@@ -53,16 +48,14 @@ import { WeekdayService } from 'core-app/core/days/weekday.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageTableTimelineGrid implements AfterViewInit {
+  private elementRef = inject(ElementRef);
+  wpTimeline = inject(WorkPackageTimelineTableController);
+  private weekdaysService = inject(WeekdayService);
+
   private activeZoomLevel:TimelineZoomLevel;
 
   private gridContainer:HTMLElement;
 
-  constructor(
-    private elementRef:ElementRef,
-    public wpTimeline:WorkPackageTimelineTableController,
-    private weekdaysService:WeekdayService,
-  ) {}
-
   ngAfterViewInit():void {
     const element = this.elementRef.nativeElement;
     this.gridContainer = element.querySelector('.wp-table-timeline--grid');
diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/header/wp-timeline-header.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/header/wp-timeline-header.directive.ts
index c92bb105c57..605e7016b29 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/header/wp-timeline-header.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/header/wp-timeline-header.directive.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, inject } from '@angular/core';
 import { WorkPackageTimelineTableController } from 'core-app/features/work-packages/components/wp-table/timeline/container/wp-timeline-container.directive';
 import moment, { Moment } from 'moment';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -50,16 +50,19 @@ import {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageTimelineHeaderController implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly wpTimelineService = inject(WorkPackageViewTimelineService);
+  readonly workPackageTimelineTableController = inject(WorkPackageTimelineTableController);
+
   public element:HTMLElement;
 
   private activeZoomLevel:TimelineZoomLevel;
 
   private innerHeader:HTMLElement;
 
-  constructor(elementRef:ElementRef,
-    readonly I18n:I18nService,
-    readonly wpTimelineService:WorkPackageViewTimelineService,
-    readonly workPackageTimelineTableController:WorkPackageTimelineTableController) {
+  constructor() {
+    const elementRef = inject(ElementRef);
+
     this.element = elementRef.nativeElement;
   }
 
diff --git a/frontend/src/app/features/work-packages/components/wp-table/wp-table-sums-row/wp-table-sums-row.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/wp-table-sums-row/wp-table-sums-row.directive.ts
index 0097787240a..eedf335a283 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/wp-table-sums-row/wp-table-sums-row.directive.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/wp-table-sums-row/wp-table-sums-row.directive.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit, Directive, ElementRef, Injector, Input,
-} from '@angular/core';
+import { AfterViewInit, Directive, ElementRef, Injector, Input, inject } from '@angular/core';
 import { takeUntil } from 'rxjs/operators';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { States } from 'core-app/core/states/states.service';
@@ -51,6 +49,15 @@ import { WorkPackageCollectionResource } from 'core-app/features/hal/resources/w
   standalone: false,
 })
 export class WorkPackageTableSumsRowController implements AfterViewInit {
+  readonly injector = inject(Injector);
+  readonly elementRef = inject(ElementRef);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly states = inject(States);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly wpTableSums = inject(WorkPackageViewSumService);
+  readonly I18n = inject(I18nService);
+
   @Input('wpTableSumsRow-table') workPackageTable:WorkPackageTable;
 
   public isHidden = true;
@@ -61,14 +68,9 @@ export class WorkPackageTableSumsRowController implements AfterViewInit {
 
   private groupSumsBuilder:GroupSumsBuilder;
 
-  constructor(readonly injector:Injector,
-    readonly elementRef:ElementRef,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly states:States,
-    readonly schemaCache:SchemaCacheService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly wpTableSums:WorkPackageViewSumService,
-    readonly I18n:I18nService) {
+  constructor() {
+    const I18n = this.I18n;
+
     this.text = {
       sum: I18n.t('js.label_total_sum'),
     };
diff --git a/frontend/src/app/features/work-packages/components/wp-table/wp-table.component.ts b/frontend/src/app/features/work-packages/components/wp-table/wp-table.component.ts
index 311f9a11443..06a14c34478 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/wp-table.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-table/wp-table.component.ts
@@ -26,18 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Injector,
-  Input,
-  OnInit,
-  Output,
-  ViewEncapsulation, OnDestroy,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Injector, Input, OnInit, Output, ViewEncapsulation, OnDestroy, inject } from '@angular/core';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
@@ -82,6 +71,19 @@ export interface WorkPackageFocusContext {
   standalone: false,
 })
 export class WorkPackagesTableComponent extends UntilDestroyedMixin implements OnInit, TableEventComponent, OnDestroy {
+  readonly elementRef = inject(ElementRef);
+  readonly injector = inject(Injector);
+  readonly states = inject(States);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly wpTableGroupBy = inject(WorkPackageViewGroupByService);
+  readonly wpTableTimeline = inject(WorkPackageViewTimelineService);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly wpTableSortBy = inject(WorkPackageViewSortByService);
+  readonly wpTableSums = inject(WorkPackageViewSumService);
+  readonly wpTableBaseline = inject(WorkPackageViewBaselineService);
+
   @Input() projectIdentifier:string;
 
   @Input('configuration') configurationObject:WorkPackageTableConfigurationObject;
@@ -136,23 +138,6 @@ export class WorkPackagesTableComponent extends UntilDestroyedMixin implements O
 
   public sumVisible = false;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly injector:Injector,
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly wpTableGroupBy:WorkPackageViewGroupByService,
-    readonly wpTableTimeline:WorkPackageViewTimelineService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly wpTableSortBy:WorkPackageViewSortByService,
-    readonly wpTableSums:WorkPackageViewSumService,
-    readonly wpTableBaseline:WorkPackageViewBaselineService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     this.configuration = new WorkPackageTableConfiguration(this.configurationObject);
     this.element = this.elementRef.nativeElement;
diff --git a/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/wp-tab-wrapper.component.ts b/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/wp-tab-wrapper.component.ts
index ef1d857e15d..ad5990065df 100644
--- a/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/wp-tab-wrapper.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/wp-tab-wrapper.component.ts
@@ -27,12 +27,7 @@
 //++
 
 import { UIRouterGlobals } from '@uirouter/core';
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { Observable } from 'rxjs';
@@ -51,6 +46,11 @@ import { WorkPackageResource } from 'core-app/features/hal/resources/work-packag
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpTabWrapperComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly uiRouterGlobals = inject(UIRouterGlobals);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly wpTabsService = inject(WorkPackageTabsService);
+
   @Input() public workPackageId:string;
   @Input() public tabIdentifier:string;
 
@@ -61,13 +61,6 @@ export class WpTabWrapperComponent implements OnInit {
     tab:WpTabDefinition | undefined;
   }>;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly uiRouterGlobals:UIRouterGlobals,
-    readonly apiV3Service:ApiV3Service,
-    readonly wpTabsService:WorkPackageTabsService
-  ) {}
-
   ngOnInit() {
     if (this.workPackageId === undefined) {
       this.workPackageId = this.uiRouterGlobals.params.workPackageId;
diff --git a/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tabs/wp-tabs.component.ts b/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tabs/wp-tabs.component.ts
index 545dc98fa50..ab6f6effc39 100644
--- a/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tabs/wp-tabs.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-tabs/components/wp-tabs/wp-tabs.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Injector, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Injector, Input, OnInit, Output, inject } from '@angular/core';
 import {
   KeepTabService,
 } from 'core-app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service';
@@ -21,6 +21,15 @@ import { WpTabDefinition } from 'core-app/features/work-packages/components/wp-t
   standalone: false,
 })
 export class WpTabsComponent implements OnInit {
+  readonly wpTabsService = inject(WorkPackageTabsService);
+  readonly I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly $state = inject(StateService);
+  readonly uiRouterGlobals = inject(UIRouterGlobals);
+  readonly keepTab = inject(KeepTabService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly currentProject = inject(CurrentProjectService);
+
   @Input() workPackage:WorkPackageResource;
 
   @Input() view:'full'|'split';
@@ -42,18 +51,6 @@ export class WpTabsComponent implements OnInit {
     },
   };
 
-  constructor(
-    readonly wpTabsService:WorkPackageTabsService,
-    readonly I18n:I18nService,
-    readonly injector:Injector,
-    readonly $state:StateService,
-    readonly uiRouterGlobals:UIRouterGlobals,
-    readonly keepTab:KeepTabService,
-    readonly pathHelper:PathHelperService,
-    readonly currentProject:CurrentProjectService,
-  ) {
-  }
-
   ngOnInit():void {
     this.canViewWatchers = !!(this.workPackage && this.workPackage.watchers);
     this.tabs = this.getDisplayableTabs();
diff --git a/frontend/src/app/features/work-packages/components/wp-tabs/services/wp-tabs/wp-tabs.service.ts b/frontend/src/app/features/work-packages/components/wp-tabs/services/wp-tabs/wp-tabs.service.ts
index cce4c6d6c80..2890616f578 100644
--- a/frontend/src/app/features/work-packages/components/wp-tabs/services/wp-tabs/wp-tabs.service.ts
+++ b/frontend/src/app/features/work-packages/components/wp-tabs/services/wp-tabs/wp-tabs.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { from } from 'rxjs';
 import { StateService } from '@uirouter/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
@@ -64,13 +64,13 @@ import {
   providedIn: 'root',
 })
 export class WorkPackageTabsService {
+  private $state = inject(StateService);
+  private I18n = inject(I18nService);
+  private injector = inject(Injector);
+
   private registeredTabs:WpTabDefinition[];
 
-  constructor(
-    private $state:StateService,
-    private I18n:I18nService,
-    private injector:Injector,
-  ) {
+  constructor() {
     this.registeredTabs = this.buildDefaultTabs();
   }
 
diff --git a/frontend/src/app/features/work-packages/components/wp-timer-button/wp-timer-button.component.ts b/frontend/src/app/features/work-packages/components/wp-timer-button/wp-timer-button.component.ts
index ee7ff7d2739..31a36a55692 100644
--- a/frontend/src/app/features/work-packages/components/wp-timer-button/wp-timer-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-timer-button/wp-timer-button.component.ts
@@ -27,7 +27,7 @@
 //++
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, Input } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -54,6 +54,16 @@ import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service
   standalone: false,
 })
 export class WorkPackageTimerButtonComponent extends UntilDestroyedMixin {
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly timeEntryService = inject(TimeEntryTimerService);
+  readonly halEditing = inject(HalResourceEditingService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly toastService = inject(ToastService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() public workPackage:WorkPackageResource;
   @InjectField() PathHelper:PathHelperService;
   @InjectField() TurboRequests:TurboRequestsService;
@@ -75,21 +85,6 @@ export class WorkPackageTimerButtonComponent extends UntilDestroyedMixin {
   };
 
 
-  constructor(
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly timeEntryService:TimeEntryTimerService,
-    readonly halEditing:HalResourceEditingService,
-    readonly schemaCache:SchemaCacheService,
-    readonly timezoneService:TimezoneService,
-    readonly toastService:ToastService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
-
   activeForWorkPackage(entry:TimeEntryResource | null):boolean {
     return !!entry && entry.entity.href === this.workPackage.href;
   }
diff --git a/frontend/src/app/features/work-packages/components/wp-watcher-button/wp-watcher-button.component.ts b/frontend/src/app/features/work-packages/components/wp-watcher-button/wp-watcher-button.component.ts
index f94c58c4704..7eeaf9afe38 100644
--- a/frontend/src/app/features/work-packages/components/wp-watcher-button/wp-watcher-button.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-watcher-button/wp-watcher-button.component.ts
@@ -27,9 +27,7 @@
 //++
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageWatchersService } from 'core-app/features/work-packages/components/wp-single-view-tabs/watchers-tab/wp-watchers.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -42,6 +40,11 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
   standalone: false,
 })
 export class WorkPackageWatcherButtonComponent extends UntilDestroyedMixin implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly wpWatchersService = inject(WorkPackageWatchersService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() public workPackage:WorkPackageResource;
 
   @Input() public disabled = false;
@@ -54,15 +57,6 @@ export class WorkPackageWatcherButtonComponent extends UntilDestroyedMixin imple
 
   public watched:boolean;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly wpWatchersService:WorkPackageWatchersService,
-    readonly apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this
       .apiV3Service
diff --git a/frontend/src/app/features/work-packages/directives/query-space/wp-isolated-query-space.directive.ts b/frontend/src/app/features/work-packages/directives/query-space/wp-isolated-query-space.directive.ts
index 11760dc0498..b848b3db9ff 100644
--- a/frontend/src/app/features/work-packages/directives/query-space/wp-isolated-query-space.directive.ts
+++ b/frontend/src/app/features/work-packages/directives/query-space/wp-isolated-query-space.directive.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Directive, ElementRef } from '@angular/core';
+import { Directive, ElementRef, inject } from '@angular/core';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import {
   OpTableActionsService,
@@ -196,10 +196,11 @@ import {
   ],
 })
 export class WorkPackageIsolatedQuerySpaceDirective {
-  constructor(
-    public querySpace:IsolatedQuerySpace,
-    elementRef:ElementRef,
-  ) {
+  querySpace = inject(IsolatedQuerySpace);
+
+  constructor() {
+    const elementRef = inject(ElementRef);
+
     debugLog('Opening isolated query space in %O', elementRef.nativeElement);
   }
 }
diff --git a/frontend/src/app/features/work-packages/openproject-work-packages.module.ts b/frontend/src/app/features/work-packages/openproject-work-packages.module.ts
index 19616116d94..ab4663dbc5a 100644
--- a/frontend/src/app/features/work-packages/openproject-work-packages.module.ts
+++ b/frontend/src/app/features/work-packages/openproject-work-packages.module.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule, inject } from '@angular/core';
 import { OpSharedModule } from 'core-app/shared/shared.module';
 import { OpenprojectFieldsModule } from 'core-app/shared/components/fields/openproject-fields.module';
 import { OpenprojectModalModule } from 'core-app/shared/components/modal/modal.module';
@@ -683,9 +683,13 @@ import {
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class OpenprojectWorkPackagesModule {
+  private injector = inject(Injector);
+
   static bootstrapAttributeGroupsCalled = false;
 
-  constructor(private injector:Injector) {
+  constructor() {
+    const injector = this.injector;
+
     OpenprojectWorkPackagesModule.bootstrapAttributeGroups(injector);
   }
 
diff --git a/frontend/src/app/features/work-packages/routing/wp-full-copy/wp-full-copy-entry.component.ts b/frontend/src/app/features/work-packages/routing/wp-full-copy/wp-full-copy-entry.component.ts
index 4e6f76a9af1..08f804e1186 100644
--- a/frontend/src/app/features/work-packages/routing/wp-full-copy/wp-full-copy-entry.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-full-copy/wp-full-copy-entry.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
 } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
@@ -48,13 +48,15 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkPackageFullCopyEntryComponent {
+  readonly elementRef = inject(ElementRef);
+
   @Input() type:string;
   @Input() copiedFromWorkPackageId:string;
   @Input() parentId?:string;
   @Input() projectIdentifier?:string;
   @Input() routedFromAngular:boolean;
 
-  constructor(readonly elementRef:ElementRef) {
+  constructor() {
     populateInputsFromDataset(this);
 
     document.body.classList.add('router--work-packages-full-create');
diff --git a/frontend/src/app/features/work-packages/routing/wp-full-create/wp-full-create-entry.component.ts b/frontend/src/app/features/work-packages/routing/wp-full-create/wp-full-create-entry.component.ts
index d5859bf0aab..12a87e55387 100644
--- a/frontend/src/app/features/work-packages/routing/wp-full-create/wp-full-create-entry.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-full-create/wp-full-create-entry.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
 } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
@@ -48,12 +48,14 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkPackageFullCreateEntryComponent {
+  readonly elementRef = inject(ElementRef);
+
   @Input() type:string;
   @Input() parentId?:string;
   @Input() projectIdentifier?:string;
   @Input() routedFromAngular:boolean;
 
-  constructor(readonly elementRef:ElementRef) {
+  constructor() {
     populateInputsFromDataset(this);
 
     document.body.classList.add('router--work-packages-full-create');
diff --git a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view-entry.component.ts b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view-entry.component.ts
index 7c0b841a1fb..ab6082b5c65 100644
--- a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view-entry.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view-entry.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
 } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
@@ -49,11 +49,13 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkPackageFullViewEntryComponent {
+  readonly elementRef = inject(ElementRef);
+
   @Input() workPackageId:string;
   @Input() activeTab:string;
   @Input() routedFromAngular:boolean;
 
-  constructor(readonly elementRef:ElementRef) {
+  constructor() {
     populateInputsFromDataset(this);
 
     document.body.classList.add('router--work-packages-full-view', 'router--work-packages-base');
diff --git a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts
index 09be2b26612..2208437e33c 100644
--- a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  HostListener,
-  Injector,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, OnInit, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
 import { TabDefinition } from 'core-app/shared/components/tabs/tab.interface';
@@ -61,6 +53,12 @@ import { Observable, of } from 'rxjs';
   standalone: false,
 })
 export class WorkPackagesFullViewComponent extends WorkPackageSingleViewBase implements OnInit {
+  wpTableSelection = inject(WorkPackageViewSelectionService);
+  recentItemsService = inject(RecentItemsService);
+  readonly $state = inject(StateService);
+  readonly currentUserService = inject(CurrentUserService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   // Watcher properties
   public isWatched:boolean;
 
@@ -80,17 +78,6 @@ export class WorkPackagesFullViewComponent extends WorkPackageSingleViewBase imp
     },
   };
 
-  constructor(
-    public injector:Injector,
-    public wpTableSelection:WorkPackageViewSelectionService,
-    public recentItemsService:RecentItemsService,
-    readonly $state:StateService,
-    readonly currentUserService:CurrentUserService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super(injector);
-  }
-
   public onTabSelected(tab:TabDefinition):void {
     if (!this.routedFromAngular) {
       this.activeTab = tab.id;
diff --git a/frontend/src/app/features/work-packages/routing/wp-split-create/wp-split-create-entry.component.ts b/frontend/src/app/features/work-packages/routing/wp-split-create/wp-split-create-entry.component.ts
index 29da7e5f034..9b755ece86c 100644
--- a/frontend/src/app/features/work-packages/routing/wp-split-create/wp-split-create-entry.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-split-create/wp-split-create-entry.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  Input,
-  OnDestroy,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnDestroy, inject } from '@angular/core';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
 } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
@@ -57,10 +50,12 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkPackageSplitCreateEntryComponent implements AfterViewInit, OnDestroy {
+  readonly elementRef = inject(ElementRef);
+
   @Input() projectIdentifier?:string;
   @Input() type?:string;
 
-  constructor(readonly elementRef:ElementRef) {
+  constructor() {
     populateInputsFromDataset(this);
     document.body.classList.add('router--work-packages-partitioned-split-view-new');
   }
diff --git a/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.component.ts b/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.component.ts
index 74bef210861..050c49eb180 100644
--- a/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, HostListener, Injector, Input, OnInit, Type } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostListener, Input, OnInit, Type, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 import {
   WorkPackageViewFocusService,
@@ -67,6 +67,17 @@ import { resolveRoutingId } from 'core-app/features/work-packages/helpers/work-p
   standalone: false,
 })
 export class WorkPackageSplitViewComponent extends WorkPackageSingleViewBase implements OnInit {
+  states = inject(States);
+  firstRoute = inject(FirstRouteService);
+  keepTab = inject(KeepTabService);
+  wpTableSelection = inject(WorkPackageViewSelectionService);
+  wpTableFocus = inject(WorkPackageViewFocusService);
+  recentItemsService = inject(RecentItemsService);
+  readonly $state = inject(StateService);
+  readonly urlParams = inject(UrlParamsService);
+  readonly backRouting = inject(BackRoutingService);
+  readonly wpTabs = inject(WorkPackageTabsService);
+
   hasState = !!this.$state.current;
   /** Reference to the base route e.g., work-packages.partitioned.list or bim.partitioned.split */
   private baseRoute:string = this.$state.current?.data?.baseRoute as string;
@@ -75,22 +86,6 @@ export class WorkPackageSplitViewComponent extends WorkPackageSingleViewBase imp
 
   @Input() resizerClass = 'work-packages-partitioned-page--content-right';
 
-  constructor(
-    public injector:Injector,
-    public states:States,
-    public firstRoute:FirstRouteService,
-    public keepTab:KeepTabService,
-    public wpTableSelection:WorkPackageViewSelectionService,
-    public wpTableFocus:WorkPackageViewFocusService,
-    public recentItemsService:RecentItemsService,
-    readonly $state:StateService,
-    readonly urlParams:UrlParamsService,
-    readonly backRouting:BackRoutingService,
-    readonly wpTabs:WorkPackageTabsService,
-  ) {
-    super(injector);
-  }
-
     // enable other parts of the application to trigger an immediate update
   // e.g. a stimulus controller
   // currently used by the new activities tab which does its own polling
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/state/wp-single-view.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/state/wp-single-view.service.ts
index 593b302cdb3..a24d68eef1c 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/state/wp-single-view.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/state/wp-single-view.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WpSingleViewStore } from './wp-single-view.store';
 import {
   filter,
@@ -27,6 +27,10 @@ import { Query } from '@datorama/akita';
 @EffectHandler
 @Injectable()
 export class WpSingleViewService {
+  readonly actions$ = inject(ActionsService);
+  readonly currentUser$ = inject(CurrentUserService);
+  private resourceService = inject(InAppNotificationsResourceService);
+
   id = 'WorkPackage Activity Store';
 
   protected store = new WpSingleViewStore();
@@ -64,13 +68,6 @@ export class WpSingleViewService {
     return { filters: this.query.getValue().notifications.filters };
   }
 
-  constructor(
-    readonly actions$:ActionsService,
-    readonly currentUser$:CurrentUserService,
-    private resourceService:InAppNotificationsResourceService,
-  ) {
-  }
-
   setFilters(workPackageId:string):void {
     const filters:ApiV3ListFilter[] = [
       ['readIAN', '=', false],
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-additional-elements.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-additional-elements.service.ts
index da3fd3abe15..477c775fbe7 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-additional-elements.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-additional-elements.service.ts
@@ -28,7 +28,7 @@
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   RelationsStateValue,
   WorkPackageRelationsService,
@@ -51,17 +51,15 @@ import { firstValueFrom } from 'rxjs';
 
 @Injectable()
 export class WorkPackageViewAdditionalElementsService {
-  constructor(
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpTableHierarchies:WorkPackageViewHierarchiesService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly halResourceService:HalResourceService,
-    readonly apiV3Service:ApiV3Service,
-    readonly schemaCache:SchemaCacheService,
-    readonly wpRelations:WorkPackageRelationsService,
-  ) {
-  }
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpTableHierarchies = inject(WorkPackageViewHierarchiesService);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly halResourceService = inject(HalResourceService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly wpRelations = inject(WorkPackageRelationsService);
+
 
   public initialize(query:QueryResource, results:WorkPackageCollectionResource):void {
     const rows = results.elements;
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-base.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-base.service.ts
index c63e9f50bc6..fe6bccffd7d 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-base.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-base.service.ts
@@ -33,22 +33,20 @@ import {
 import { map, mapTo, take } from 'rxjs/operators';
 import { merge, Observable } from 'rxjs';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QuerySchemaResource } from 'core-app/features/hal/resources/query-schema-resource';
 import { WorkPackageCollectionResource } from 'core-app/features/hal/resources/wp-collection-resource';
 
 @Injectable()
 export abstract class WorkPackageViewBaseService<T> {
+  protected readonly querySpace = inject(IsolatedQuerySpace);
+
   /** Internal state to push non-persisted updates */
   protected updatesState = input<T>();
 
   /** Internal pristine state filled during +initialize+ only */
   protected pristineState = input<T>();
 
-  constructor(
-    protected readonly querySpace:IsolatedQuerySpace,
-  ) { }
-
   /**
    * Get the state value from the current query.
    *
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-baseline.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-baseline.service.ts
index a0f42f7c84e..64ba8d348cc 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-baseline.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-baseline.service.ts
@@ -26,9 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { States } from 'core-app/core/states/states.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { WorkPackageQueryStateService } from './wp-view-base.service';
@@ -66,17 +65,12 @@ export const BASELINE_INCOMPATIBLE_COLUMNS = [
 
 @Injectable()
 export class WorkPackageViewBaselineService extends WorkPackageQueryStateService<string[]> {
-  constructor(
-    protected readonly states:States,
-    protected readonly querySpace:IsolatedQuerySpace,
-    protected readonly pathHelper:PathHelperService,
-    protected readonly configurationService:ConfigurationService,
-    protected readonly timezoneService:TimezoneService,
-    protected readonly weekdaysService:WeekdayService,
-    protected readonly daysService:DayResourceService,
-  ) {
-    super(querySpace);
-  }
+  protected readonly states = inject(States);
+  protected readonly pathHelper = inject(PathHelperService);
+  protected readonly configurationService = inject(ConfigurationService);
+  protected readonly timezoneService = inject(TimezoneService);
+  protected readonly weekdaysService = inject(WeekdayService);
+  protected readonly daysService = inject(DayResourceService);
 
   public nonWorkingDays:IDay[] = [];
 
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-collapsed-groups.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-collapsed-groups.service.ts
index 98db7f395c1..e9c0457bb54 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-collapsed-groups.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-collapsed-groups.service.ts
@@ -27,9 +27,8 @@
 //++
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageViewGroupByService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { take } from 'rxjs/operators';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
@@ -40,7 +39,12 @@ import { WorkPackageViewBaseService } from './wp-view-base.service';
 
 @Injectable()
 export class WorkPackageViewCollapsedGroupsService extends WorkPackageViewBaseService<IGroupsCollapseEvent> {
-  readonly wpTypesToShowInCollapsedGroupHeaders:((wp:WorkPackageResource) => boolean)[];
+  readonly workPackageViewGroupByService = inject(WorkPackageViewGroupByService);
+  private schemaCacheService = inject(SchemaCacheService);
+
+  isMilestone = (workPackage:WorkPackageResource):boolean => this.schemaCacheService.of(workPackage)?.isMilestone as boolean;
+
+  readonly wpTypesToShowInCollapsedGroupHeaders:((wp:WorkPackageResource) => boolean)[] = [this.isMilestone];
 
   readonly groupTypesWithHeaderCellsWhenCollapsed = ['project'];
 
@@ -64,15 +68,6 @@ export class WorkPackageViewCollapsedGroupsService extends WorkPackageViewBaseSe
     return this.workPackageViewGroupByService.current;
   }
 
-  constructor(
-    protected readonly querySpace:IsolatedQuerySpace,
-    readonly workPackageViewGroupByService:WorkPackageViewGroupByService,
-    private schemaCacheService:SchemaCacheService,
-  ) {
-    super(querySpace);
-    this.wpTypesToShowInCollapsedGroupHeaders = [this.isMilestone];
-  }
-
   // Every time the groupedBy changes, this services is initialized
   private getDefaultState():IGroupsCollapseEvent {
     return {
@@ -84,8 +79,6 @@ export class WorkPackageViewCollapsedGroupsService extends WorkPackageViewBaseSe
     };
   }
 
-  isMilestone = (workPackage:WorkPackageResource):boolean => this.schemaCacheService.of(workPackage)?.isMilestone;
-
   toggleGroupCollapseState(groupIdentifier:string):void {
     const newCollapsedState = !this.config.state[groupIdentifier];
     const state = {
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-columns.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-columns.service.ts
index f205112542a..aa165a42cba 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-columns.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-columns.service.ts
@@ -27,9 +27,8 @@
 //++
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { States } from 'core-app/core/states/states.service';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QueryColumn, queryColumnTypes } from 'core-app/features/work-packages/components/wp-query/query-column';
 import { combine } from '@openproject/reactivestates';
 import { mapTo, take } from 'rxjs/operators';
@@ -39,9 +38,7 @@ import { sharedUserColumn } from 'core-app/features/work-packages/components/wp-
 
 @Injectable()
 export class WorkPackageViewColumnsService extends WorkPackageQueryStateService<QueryColumn[]> {
-  public constructor(readonly states:States, readonly querySpace:IsolatedQuerySpace) {
-    super(querySpace);
-  }
+  readonly states = inject(States);
 
   public valueFromQuery(query:QueryResource):QueryColumn[] {
     return [...query.columns];
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-display-representation.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-display-representation.service.ts
index c9a1462b16d..122037c6e7e 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-display-representation.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-display-representation.service.ts
@@ -28,8 +28,7 @@
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { States } from 'core-app/core/states/states.service';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageQueryStateService } from './wp-view-base.service';
 
 export const wpDisplayListRepresentation = 'list';
@@ -38,12 +37,7 @@ export type WorkPackageDisplayRepresentationValue = 'list'|'card';
 
 @Injectable()
 export class WorkPackageViewDisplayRepresentationService extends WorkPackageQueryStateService<string|null> {
-  public constructor(
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-  ) {
-    super(querySpace);
-  }
+  readonly states = inject(States);
 
   public hasChanged(query:QueryResource) {
     return this.current !== query.displayRepresentation;
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service.ts
index c30403fa751..17e3ec620e5 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
+import { Injectable, inject } from '@angular/core';
 import { combine, input, InputState } from '@openproject/reactivestates';
 import { States } from 'core-app/core/states/states.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
@@ -43,6 +42,8 @@ import { map } from 'rxjs/operators';
 
 @Injectable()
 export class WorkPackageViewFiltersService extends WorkPackageQueryStateService<QueryFilterInstanceResource[]> {
+  protected readonly states = inject(States);
+
   public hidden:string[] = [
     'datesInterval',
     'precedes',
@@ -68,13 +69,6 @@ export class WorkPackageViewFiltersService extends WorkPackageQueryStateService<
   /** Flag state to determine whether the filters are incomplete */
   private incomplete = input<boolean>(false);
 
-  constructor(
-    protected readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-  ) {
-    super(querySpace);
-  }
-
   /**
    * Load all schemas for the current filters and fill respective states
    * @param query
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-focus.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-focus.service.ts
index ca688718c30..e3ca9d317ce 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-focus.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-focus.service.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 import { WorkPackageViewSelectionService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-selection.service';
@@ -42,10 +41,7 @@ export interface WPFocusState {
 
 @Injectable()
 export class WorkPackageViewFocusService extends WorkPackageViewBaseService<WPFocusState> {
-  constructor(public querySpace:IsolatedQuerySpace,
-    public wpTableSelection:WorkPackageViewSelectionService) {
-    super(querySpace);
-  }
+  wpTableSelection = inject(WorkPackageViewSelectionService);
 
   public isFocused(workPackageId:string) {
     return this.focusedWorkPackage === workPackageId;
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service.ts
index 42bd70f975e..f49b9e037dc 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service.ts
@@ -28,8 +28,7 @@
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { States } from 'core-app/core/states/states.service';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QueryColumn } from 'core-app/features/work-packages/components/wp-query/query-column';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { QueryGroupByResource } from 'core-app/features/hal/resources/query-group-by-resource';
@@ -37,10 +36,7 @@ import { WorkPackageQueryStateService } from './wp-view-base.service';
 
 @Injectable()
 export class WorkPackageViewGroupByService extends WorkPackageQueryStateService<QueryGroupByResource|null> {
-  public constructor(readonly states:States,
-    readonly querySpace:IsolatedQuerySpace) {
-    super(querySpace);
-  }
+  readonly states = inject(States);
 
   valueFromQuery(query:QueryResource) {
     return query.groupBy || null;
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-hierarchy-indentation.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-hierarchy-indentation.service.ts
index 4a77fb03278..9ce2a774418 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-hierarchy-indentation.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-hierarchy-indentation.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { WorkPackageViewHierarchiesService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-hierarchy.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
@@ -10,13 +10,13 @@ import { firstValueFrom } from 'rxjs';
 
 @Injectable()
 export class WorkPackageViewHierarchyIdentationService {
-  constructor(private wpViewHierarchies:WorkPackageViewHierarchiesService,
-    private wpDisplayRepresentation:WorkPackageViewDisplayRepresentationService,
-    private states:States,
-    private wpRelationHierarchy:WorkPackageRelationsHierarchyService,
-    private apiV3Service:ApiV3Service,
-    private querySpace:IsolatedQuerySpace) {
-  }
+  private wpViewHierarchies = inject(WorkPackageViewHierarchiesService);
+  private wpDisplayRepresentation = inject(WorkPackageViewDisplayRepresentationService);
+  private states = inject(States);
+  private wpRelationHierarchy = inject(WorkPackageRelationsHierarchyService);
+  private apiV3Service = inject(ApiV3Service);
+  private querySpace = inject(IsolatedQuerySpace);
+
 
   /**
    * Return whether the current hierarchy mode is active
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service.ts
index 301c3a38667..d47077dc9b8 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-highlighting.service.ts
@@ -1,6 +1,5 @@
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { States } from 'core-app/core/states/states.service';
 import { BannersService } from 'core-app/core/enterprise/banners.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
@@ -13,13 +12,8 @@ import { WorkPackageQueryStateService } from './wp-view-base.service';
 
 @Injectable()
 export class WorkPackageViewHighlightingService extends WorkPackageQueryStateService<WorkPackageViewHighlight> {
-  public constructor(
-    readonly states:States,
-    readonly Banners:BannersService,
-    readonly querySpace:IsolatedQuerySpace,
-  ) {
-    super(querySpace);
-  }
+  readonly states = inject(States);
+  readonly Banners = inject(BannersService);
 
   initialize(query:QueryResource, results:WorkPackageCollectionResource, schema?:QuerySchemaResource) {
     super.initialize(query, results, schema);
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-include-subprojects.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-include-subprojects.service.ts
index 5767c5aea94..453a2c72c69 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-include-subprojects.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-include-subprojects.service.ts
@@ -28,18 +28,12 @@
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { States } from 'core-app/core/states/states.service';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WorkPackageQueryStateService } from './wp-view-base.service';
 
 @Injectable()
 export class WorkPackageViewIncludeSubprojectsService extends WorkPackageQueryStateService<boolean> {
-  public constructor(
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-  ) {
-    super(querySpace);
-  }
+  readonly states = inject(States);
 
   public hasChanged(query:QueryResource):boolean {
     return this.current !== query.includeSubprojects;
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-order.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-order.service.ts
index 96777b637d1..8a8b2ece757 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-order.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-order.service.ts
@@ -26,11 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { take } from 'rxjs/operators';
 import { InputState } from '@openproject/reactivestates';
 import { States } from 'core-app/core/states/states.service';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
@@ -47,16 +46,11 @@ import { firstValueFrom } from 'rxjs';
 
 @Injectable()
 export class WorkPackageViewOrderService extends WorkPackageQueryStateService<QueryOrder> {
-  constructor(
-    protected readonly querySpace:IsolatedQuerySpace,
-    protected readonly apiV3Service:ApiV3Service,
-    protected readonly states:States,
-    protected readonly causedUpdates:CausedUpdatesService,
-    protected readonly wpTableSortBy:WorkPackageViewSortByService,
-    protected readonly pathHelper:PathHelperService,
-) {
-    super(querySpace);
-  }
+  protected readonly apiV3Service = inject(ApiV3Service);
+  protected readonly states = inject(States);
+  protected readonly causedUpdates = inject(CausedUpdatesService);
+  protected readonly wpTableSortBy = inject(WorkPackageViewSortByService);
+  protected readonly pathHelper = inject(PathHelperService);
 
   public initialize(query:QueryResource, results:WorkPackageCollectionResource, schema?:QuerySchemaResource):Promise<unknown> {
     // Take over our current value if the query is not saved
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-pagination.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-pagination.service.ts
index aef7acd9534..d493ef910c2 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-pagination.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-pagination.service.ts
@@ -26,10 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { WorkPackageCollectionResource } from 'core-app/features/hal/resources/wp-collection-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { WorkPackageViewPagination } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-table-pagination';
 import { WorkPackageViewBaseService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-base.service';
 import { PaginationObject, PaginationService } from 'core-app/shared/components/table-pagination/pagination-service';
@@ -43,10 +42,7 @@ export interface PaginationUpdateObject {
 
 @Injectable()
 export class WorkPackageViewPaginationService extends WorkPackageViewBaseService<WorkPackageViewPagination> {
-  public constructor(querySpace:IsolatedQuerySpace,
-    readonly paginationService:PaginationService) {
-    super(querySpace);
-  }
+  readonly paginationService = inject(PaginationService);
 
   public get paginationObject():PaginationObject {
     if (this.current) {
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-relation-columns.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-relation-columns.service.ts
index fe2ae04ef81..474b97f6505 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-relation-columns.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-relation-columns.service.ts
@@ -29,9 +29,8 @@
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { WorkPackageViewRelationColumns } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-table-relation-columns';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { RelationsStateValue, WorkPackageRelationsService } from 'core-app/features/work-packages/components/wp-relations/wp-relations.service';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   QueryColumn,
   queryColumnTypes,
@@ -48,15 +47,10 @@ export type RelationColumnType = 'toType'|'ofType'|'children';
 
 @Injectable()
 export class WorkPackageViewRelationColumnsService extends WorkPackageViewBaseService<WorkPackageViewRelationColumns> {
-  constructor(
-public querySpace:IsolatedQuerySpace,
-    public wpTableColumns:WorkPackageViewColumnsService,
-    public halResourceService:HalResourceService,
-    public apiV3Service:ApiV3Service,
-    public wpRelations:WorkPackageRelationsService,
-) {
-    super(querySpace);
-  }
+  wpTableColumns = inject(WorkPackageViewColumnsService);
+  halResourceService = inject(HalResourceService);
+  apiV3Service = inject(ApiV3Service);
+  wpRelations = inject(WorkPackageRelationsService);
 
   public valueFromQuery(_query:QueryResource):WorkPackageViewRelationColumns {
     // Take over current expanded values
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-selection.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-selection.service.ts
index ca5bef4548e..8c5da761bd9 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-selection.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-selection.service.ts
@@ -1,5 +1,4 @@
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { States } from 'core-app/core/states/states.service';
 import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
@@ -18,10 +17,12 @@ export interface WorkPackageViewSelectionState {
 
 @Injectable()
 export class WorkPackageViewSelectionService extends WorkPackageViewBaseService<WorkPackageViewSelectionState> implements OnDestroy {
-  public constructor(readonly querySpace:IsolatedQuerySpace,
-    readonly states:States,
-    readonly opContextMenu:OPContextMenuService) {
-    super(querySpace);
+  readonly states = inject(States);
+  readonly opContextMenu = inject(OPContextMenuService);
+
+  public constructor() {
+    super();
+
     this.reset();
   }
 
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sort-by.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sort-by.service.ts
index c74075631f6..74c46b4e906 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sort-by.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sort-by.service.ts
@@ -28,10 +28,9 @@
 
 import { combine } from '@openproject/reactivestates';
 import { mapTo } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { States } from 'core-app/core/states/states.service';
 import { QuerySortByResource } from 'core-app/features/hal/resources/query-sort-by-resource';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -40,11 +39,8 @@ import { WorkPackageQueryStateService } from './wp-view-base.service';
 
 @Injectable()
 export class WorkPackageViewSortByService extends WorkPackageQueryStateService<QuerySortByResource[]> {
-  constructor(protected readonly states:States,
-    protected readonly querySpace:IsolatedQuerySpace,
-    protected readonly pathHelper:PathHelperService) {
-    super(querySpace);
-  }
+  protected readonly states = inject(States);
+  protected readonly pathHelper = inject(PathHelperService);
 
   public valueFromQuery(query:QueryResource) {
     return [...query.sortBy];
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sum.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sum.service.ts
index 94df241c0a9..8316c88907f 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sum.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-sum.service.ts
@@ -27,15 +27,11 @@
 //++
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { Injectable } from '@angular/core';
 import { WorkPackageQueryStateService } from './wp-view-base.service';
 
 @Injectable()
 export class WorkPackageViewSumService extends WorkPackageQueryStateService<boolean> {
-  public constructor(querySpace:IsolatedQuerySpace) {
-    super(querySpace);
-  }
 
   public valueFromQuery(query:QueryResource) {
     return !!query.sums;
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service.ts
index eedb1043264..a9ee99762a5 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service.ts
@@ -28,7 +28,6 @@
 
 import { Injectable } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { input } from '@openproject/reactivestates';
 import { WorkPackageTimelineState } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-table-timeline';
 import { zoomLevelOrder } from 'core-app/features/work-packages/components/wp-table/timeline/wp-timeline';
@@ -40,10 +39,6 @@ export class WorkPackageViewTimelineService extends WorkPackageQueryStateService
   /** Remember the computed zoom level to correct zooming after leaving autozoom */
   public appliedZoomLevel$ = input<TimelineZoomLevel>('auto');
 
-  public constructor(protected readonly querySpace:IsolatedQuerySpace) {
-    super(querySpace);
-  }
-
   public valueFromQuery(query:QueryResource) {
     return {
       ...this.defaultState,
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/work-package-single-view.base.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/work-package-single-view.base.ts
index cd499bb647f..87659920fbb 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/work-package-single-view.base.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/work-package-single-view.base.ts
@@ -26,12 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectorRef,
-  Directive,
-  Injector,
-  Input,
-} from '@angular/core';
+import { ChangeDetectorRef, Directive, Injector, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import {
@@ -71,6 +66,8 @@ import { StateService } from '@uirouter/angular';
 
 @Directive()
 export abstract class WorkPackageSingleViewBase extends UntilDestroyedMixin {
+  injector = inject(Injector);
+
   @Input() routedFromAngular = true;
 
   @Input() workPackageId:string;
@@ -128,9 +125,7 @@ export abstract class WorkPackageSingleViewBase extends UntilDestroyedMixin {
 
   public displayNotificationsButton$:Observable<boolean>;
 
-  constructor(
-    public injector:Injector,
-  ) {
+  constructor() {
     super();
 
     if (this.routedFromAngular && this.workPackageId === undefined) {
diff --git a/frontend/src/app/features/work-packages/routing/wp-view-base/work-packages-view.base.ts b/frontend/src/app/features/work-packages/routing/wp-view-base/work-packages-view.base.ts
index aeb8116befe..9b45c0eb85e 100644
--- a/frontend/src/app/features/work-packages/routing/wp-view-base/work-packages-view.base.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-view-base/work-packages-view.base.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectorRef, Directive, Injector, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Directive, Injector, OnDestroy, OnInit, inject } from '@angular/core';
 import { StateService, TransitionService } from '@uirouter/core';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
@@ -94,6 +94,8 @@ import { tableRefreshRequest } from 'core-app/features/work-packages/routing/wp-
 
 @Directive()
 export abstract class WorkPackagesViewBase extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  injector = inject(Injector);
+
   @InjectField() $state:StateService;
 
   @InjectField() states:States;
@@ -158,10 +160,6 @@ export abstract class WorkPackagesViewBase extends UntilDestroyedMixin implement
   /** Remember explicitly when this component was destroyed */
   destroyed = false;
 
-  constructor(public injector:Injector) {
-    super();
-  }
-
   ngOnInit() {
     // Listen to changes on the query state objects
     this.setupQueryObservers();
diff --git a/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts b/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts
index 7044fb5d375..2483047d9d6 100644
--- a/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts
+++ b/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { IToast } from 'core-app/shared/components/toaster/toast.service';
 import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
@@ -36,13 +36,8 @@ import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service
 
 @Injectable()
 export class WorkPackageNotificationService extends HalResourceNotificationService {
-  constructor(
-    readonly injector:Injector,
-    readonly apiV3Service:ApiV3Service,
-    readonly turboRequests:TurboRequestsService,
-  ) {
-    super(injector);
-  }
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly turboRequests = inject(TurboRequestsService);
 
   public showSave(resource:HalResource, isCreate = false) {
     const message:IToast = {
diff --git a/frontend/src/app/features/work-packages/services/work-package.service.ts b/frontend/src/app/features/work-packages/services/work-package.service.ts
index adf66211379..3d9d3f5741f 100644
--- a/frontend/src/app/features/work-packages/services/work-package.service.ts
+++ b/frontend/src/app/features/work-packages/services/work-package.service.ts
@@ -39,21 +39,20 @@ import { resolveNumericId } from 'core-app/features/work-packages/helpers/work-p
 
 @Injectable()
 export class WorkPackageService {
+  private readonly http = inject(HttpClient);
+  private readonly $state = inject(StateService);
+  private readonly PathHelper = inject(PathHelperService);
+  private readonly UrlParamsHelper = inject(UrlParamsHelperService);
+  private readonly toastService = inject(ToastService);
+  private readonly I18n = inject(I18nService);
+  private readonly halEvents = inject(HalEventsService);
+
   private text = {
     successful_delete: this.I18n.t('js.work_packages.message_successful_bulk_delete'),
   };
 
   private readonly states = inject(States);
 
-  constructor(private readonly http:HttpClient,
-    private readonly $state:StateService,
-    private readonly PathHelper:PathHelperService,
-    private readonly UrlParamsHelper:UrlParamsHelperService,
-    private readonly toastService:ToastService,
-    private readonly I18n:I18nService,
-    private readonly halEvents:HalEventsService) {
-  }
-
   public performBulkDelete(ids:string[], defaultHandling:boolean) {
     const params = {
       'ids[]': ids,
diff --git a/frontend/src/app/shared/components/attachments/attachment-list/attachment-list-item.component.ts b/frontend/src/app/shared/components/attachments/attachment-list/attachment-list-item.component.ts
index 2c4f7d9334a..72b3719864d 100644
--- a/frontend/src/app/shared/components/attachments/attachment-list/attachment-list-item.component.ts
+++ b/frontend/src/app/shared/components/attachments/attachment-list/attachment-list-item.component.ts
@@ -26,17 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild, inject } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -60,6 +50,13 @@ import { IFileIcon } from 'core-app/shared/components/storages/icons.mapping';
   standalone: false,
 })
 export class OpAttachmentListItemComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit {
+  private readonly I18n = inject(I18nService);
+  private readonly pathHelper = inject(PathHelperService);
+  private readonly timezoneService = inject(TimezoneService);
+  private readonly confirmDialogService = inject(ConfirmDialogService);
+  private readonly principalsResourceService = inject(PrincipalsResourceService);
+  private readonly principalRendererService = inject(PrincipalRendererService);
+
   @Input() public attachment:IAttachment;
 
   @Input() public index:number;
@@ -94,17 +91,6 @@ export class OpAttachmentListItemComponent extends UntilDestroyedMixin implement
 
   private viewInitialized$ = new BehaviorSubject<boolean>(false);
 
-  constructor(
-    private readonly I18n:I18nService,
-    private readonly pathHelper:PathHelperService,
-    private readonly timezoneService:TimezoneService,
-    private readonly confirmDialogService:ConfirmDialogService,
-    private readonly principalsResourceService:PrincipalsResourceService,
-    private readonly principalRendererService:PrincipalRendererService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     this.fileIcon = getIconForMimeType(this.attachment.contentType);
 
diff --git a/frontend/src/app/shared/components/attachments/attachment-list/attachment-list.component.ts b/frontend/src/app/shared/components/attachments/attachment-list/attachment-list.component.ts
index 5763e73f5b6..9765fbb7782 100644
--- a/frontend/src/app/shared/components/attachments/attachment-list/attachment-list.component.ts
+++ b/frontend/src/app/shared/components/attachments/attachment-list/attachment-list.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { IAttachment } from 'core-app/core/state/attachments/attachment.model';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { AttachmentsResourceService } from 'core-app/core/state/attachments/attachments.service';
@@ -44,6 +38,8 @@ import { AttachmentsResourceService } from 'core-app/core/state/attachments/atta
   standalone: false,
 })
 export class OpAttachmentListComponent extends UntilDestroyedMixin {
+  private readonly attachmentsResourceService = inject(AttachmentsResourceService);
+
   @Input() public attachments:IAttachment[] = [];
 
   @Input() public collectionKey:string;
@@ -54,12 +50,6 @@ export class OpAttachmentListComponent extends UntilDestroyedMixin {
 
   @Output() public attachmentRemoved = new EventEmitter<void>();
 
-  constructor(
-    private readonly attachmentsResourceService:AttachmentsResourceService,
-  ) {
-    super();
-  }
-
   public removeAttachment(attachment:IAttachment):void {
     this.attachmentsResourceService.removeAttachment(this.collectionKey, attachment).subscribe(() => {
       this.attachmentRemoved.emit();
diff --git a/frontend/src/app/shared/components/attachments/attachments.component.ts b/frontend/src/app/shared/components/attachments/attachments.component.ts
index 9aab8cadc47..037a4401a15 100644
--- a/frontend/src/app/shared/components/attachments/attachments.component.ts
+++ b/frontend/src/app/shared/components/attachments/attachments.component.ts
@@ -26,20 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostBinding,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { fromEvent, Observable } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
@@ -69,6 +56,16 @@ function containsFiles(dataTransfer:DataTransfer):boolean {
   standalone: false,
 })
 export class OpAttachmentsComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  elementRef = inject(ElementRef);
+  protected readonly I18n = inject(I18nService);
+  protected readonly states = inject(States);
+  protected readonly toastService = inject(ToastService);
+  private readonly uploadService = inject(OpUploadService);
+  protected readonly halResourceService = inject(HalResourceService);
+  protected readonly attachmentsResourceService = inject(AttachmentsResourceService);
+  protected readonly timezoneService = inject(TimezoneService);
+  protected readonly cdRef = inject(ChangeDetectorRef);
+
   @HostBinding('attr.data-test-selector') public testSelector = 'op-attachments';
 
   @HostBinding('class.op-file-section') public className = true;
@@ -135,17 +132,7 @@ export class OpAttachmentsComponent extends UntilDestroyedMixin implements OnIni
     this.cdRef.detectChanges();
   };
 
-  constructor(
-    public elementRef:ElementRef,
-    protected readonly I18n:I18nService,
-    protected readonly states:States,
-    protected readonly toastService:ToastService,
-    private readonly uploadService:OpUploadService,
-    protected readonly halResourceService:HalResourceService,
-    protected readonly attachmentsResourceService:AttachmentsResourceService,
-    protected readonly timezoneService:TimezoneService,
-    protected readonly cdRef:ChangeDetectorRef,
-  ) {
+  constructor() {
     super();
 
     populateInputsFromDataset(this);
diff --git a/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text-modal.service.ts b/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text-modal.service.ts
index 33771009941..8f251654527 100644
--- a/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text-modal.service.ts
+++ b/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text-modal.service.ts
@@ -26,18 +26,15 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 
 @Injectable({ providedIn: 'root' })
 export class AttributeHelpTextModalService {
-  constructor(
-    protected pathHelper:PathHelperService,
-    protected turboRequests:TurboRequestsService,
-  ) {
+  protected pathHelper = inject(PathHelperService);
+  protected turboRequests = inject(TurboRequestsService);
 
-  }
 
   public show(helpTextId:string):Promise<unknown> {
     return this.turboRequests.requestStream(this.helpTextModalUrl(helpTextId));
diff --git a/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.component.ts b/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.component.ts
index 625bd116a17..1170e3feac2 100644
--- a/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.component.ts
+++ b/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Injector,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import { AttributeHelpTextsService } from './attribute-help-text.service';
@@ -50,6 +42,13 @@ export const attributeHelpTextSelector = 'attribute-help-text';
   standalone: false,
 })
 export class AttributeHelpTextComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  protected attributeHelpTexts = inject(AttributeHelpTextsService);
+  protected attributeHelpTextModalService = inject(AttributeHelpTextModalService);
+  protected cdRef = inject(ChangeDetectorRef);
+  protected injector = inject(Injector);
+  protected I18n = inject(I18nService);
+
   // Attribute to show help text for
   @Input() public attribute:string;
 
@@ -69,14 +68,7 @@ export class AttributeHelpTextComponent implements OnInit {
     open_dialog: this.I18n.t('js.help_texts.show_modal'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    protected attributeHelpTexts:AttributeHelpTextsService,
-    protected attributeHelpTextModalService:AttributeHelpTextModalService,
-    protected cdRef:ChangeDetectorRef,
-    protected injector:Injector,
-    protected I18n:I18nService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.service.ts b/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.service.ts
index ea15bf05fc7..31fb87c8e90 100644
--- a/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.service.ts
+++ b/frontend/src/app/shared/components/attribute-help-texts/attribute-help-text.service.ts
@@ -27,17 +27,16 @@
 //++
 
 import { input } from '@openproject/reactivestates';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { HelpTextResource } from 'core-app/features/hal/resources/help-text-resource';
 import { firstValueFrom, map } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })
 export class AttributeHelpTextsService {
-  private helpTexts = input<HelpTextResource[]>();
+  private apiV3Service = inject(ApiV3Service);
 
-  constructor(private apiV3Service:ApiV3Service) {
-  }
+  private helpTexts = input<HelpTextResource[]>();
 
   /**
    * Search for a given attribute help text
diff --git a/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.component.ts b/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.component.ts
index 2b538e87a00..01f36fade43 100644
--- a/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.component.ts
+++ b/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Injector,
-  Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Injector, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
@@ -48,6 +40,12 @@ import { StaticAttributeHelpTextModalComponent } from './static-attribute-help-t
   standalone: false,
 })
 export class StaticAttributeHelpTextComponent {
+  readonly elementRef = inject(ElementRef);
+  protected opModalService = inject(OpModalService);
+  protected cdRef = inject(ChangeDetectorRef);
+  protected injector = inject(Injector);
+  protected I18n = inject(I18nService);
+
   // Attribute pass the modal title and content
   @Input() public title:string;
 
@@ -59,13 +57,7 @@ export class StaticAttributeHelpTextComponent {
     open_dialog: this.I18n.t('js.help_texts.show_modal'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    protected opModalService:OpModalService,
-    protected cdRef:ChangeDetectorRef,
-    protected injector:Injector,
-    protected I18n:I18nService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.modal.ts b/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.modal.ts
index cf0b0862e49..6098d3e758a 100644
--- a/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.modal.ts
+++ b/frontend/src/app/shared/components/attribute-help-texts/static-attribute-help-text.modal.ts
@@ -26,13 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 
 @Component({
   templateUrl: './static-attribute-help-text.modal.html',
@@ -40,6 +36,8 @@ import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
   standalone: false,
 })
 export class StaticAttributeHelpTextModalComponent extends OpModalComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+
   readonly text = {
     close: this.I18n.t('js.button_close'),
   };
@@ -47,17 +45,4 @@ export class StaticAttributeHelpTextModalComponent extends OpModalComponent impl
   public title:string = this.locals.title as string;
 
   public content:string = this.locals.content as string;
-
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
-  ngOnInit() {
-    super.ngOnInit();
-  }
 }
diff --git a/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts
index 3fed492e2c7..01ee86deb3a 100644
--- a/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts
@@ -26,17 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Injector,
-  Input,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Injector, Input, Output, ViewChild, inject } from '@angular/core';
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -64,6 +54,8 @@ export interface CreateAutocompleterValueOption {
   standalone: false,
 })
 export class CreateAutocompleterComponent extends UntilDestroyedMixin implements AfterViewInit {
+  readonly injector = inject(Injector);
+
   @Input() public availableValues:CreateAutocompleterValueOption[];
 
   @Input() public appendTo:string;
@@ -118,7 +110,7 @@ export class CreateAutocompleterComponent extends UntilDestroyedMixin implements
 
   private _openDirectly = false;
 
-  constructor(readonly injector:Injector) {
+  constructor() {
     super();
 
     this.text.add_new_action = this.I18n.t('js.label_create');
diff --git a/frontend/src/app/shared/components/autocompleter/draggable-autocomplete/draggable-autocomplete.component.ts b/frontend/src/app/shared/components/autocompleter/draggable-autocomplete/draggable-autocomplete.component.ts
index 13f984ccd74..49299f0eb11 100644
--- a/frontend/src/app/shared/components/autocompleter/draggable-autocomplete/draggable-autocomplete.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/draggable-autocomplete/draggable-autocomplete.component.ts
@@ -1,15 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnInit,
-  OnDestroy,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnInit, OnDestroy, Output, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { DragulaService, Group } from 'ng2-dragula';
@@ -40,6 +29,11 @@ export interface DraggableOption {
   standalone: false,
 })
 export class DraggableAutocompleteComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly elementRef = inject(ElementRef);
+  readonly dragula = inject(DragulaService);
+  readonly alternativeSearchService = inject(AlternativeSearchService);
+
   /** Options to show in the autocompleter */
   @Input() options:DraggableOption[];
 
@@ -98,15 +92,6 @@ export class DraggableAutocompleteComponent extends UntilDestroyedMixin implemen
 
   public appendTo = 'body';
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    readonly dragula:DragulaService,
-    readonly alternativeSearchService:AlternativeSearchService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     populateInputsFromDataset(this);
 
diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts
index e54f12128c9..a3671506caa 100644
--- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts
@@ -1,27 +1,6 @@
 /* We just forward the ng-select outputs without renaming */
 /* eslint-disable @angular-eslint/no-output-native */
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ContentChild,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  HostBinding,
-  Injector,
-  Input,
-  OnChanges,
-  OnInit,
-  Output,
-  SimpleChanges,
-  TemplateRef,
-  Type,
-  ViewChild,
-  ViewContainerRef,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ElementRef, EventEmitter, forwardRef, HostBinding, Injector, Input, OnChanges, OnInit, Output, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, ViewEncapsulation, inject } from '@angular/core';
 import { DropdownPosition, NgSelectComponent } from '@ng-select/ng-select';
 import { BehaviorSubject, merge, NEVER, Observable, of, Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators';
@@ -96,6 +75,16 @@ type GroupValueFn = (key:string | any, children:any[]) => string | any;
 export class OpAutocompleterComponent<T extends IAutocompleteItem = IAutocompleteItem>
   extends UntilDestroyedMixin
   implements OnInit, AfterViewInit, OnChanges, ControlValueAccessor {
+  readonly injector = inject(Injector);
+  readonly elementRef = inject<ElementRef<HTMLElement & { ngSelectComponentInstance?:NgSelectComponent }>>(ElementRef);
+  readonly http = inject(HttpClient);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly vcRef = inject(ViewContainerRef);
+  readonly I18n = inject(I18nService);
+  readonly halResourceService = inject(HalResourceService);
+  readonly pathHelperService = inject(PathHelperService);
+
   @HostBinding('class.op-autocompleter') className = true;
 
   @Input() public filters?:IAPIFilter[] = [];
@@ -297,21 +286,7 @@ export class OpAutocompleterComponent<T extends IAutocompleteItem = IAutocomplet
 
   footerTemplate:TemplateRef<Element>;
 
-  readonly opAutocompleterService = new OpAutocompleterService(this.apiV3Service, this.halResourceService);
-
-  constructor(
-    readonly injector:Injector,
-    readonly elementRef:ElementRef,
-    readonly http:HttpClient,
-    readonly apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-    readonly vcRef:ViewContainerRef,
-    readonly I18n:I18nService,
-    readonly halResourceService:HalResourceService,
-    readonly pathHelperService:PathHelperService,
-  ) {
-    super();
-  }
+  readonly opAutocompleterService = inject(OpAutocompleterService);
 
   ngOnInit() {
     populateInputsFromDataset(this);
@@ -333,8 +308,7 @@ export class OpAutocompleterComponent<T extends IAutocompleteItem = IAutocomplet
 
   ngAfterViewInit():void {
     // Store ng-select instance on the host element for access from Stimulus controllers
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-explicit-any
-    (this.elementRef.nativeElement as any).ngSelectComponentInstance = this.ngSelectInstance;
+    this.elementRef.nativeElement.ngSelectComponentInstance = this.ngSelectInstance;
 
     if (this.inputName && this.model) {
       this.syncHiddenField(this.mappedInputValue);
@@ -484,7 +458,7 @@ export class OpAutocompleterComponent<T extends IAutocompleteItem = IAutocomplet
     }
 
     return this.typeahead.pipe(
-      filter(() => !!(this.defaultData || this.url || this.getOptionsFn)),
+      filter(() => [this.defaultData, this.url, this.getOptionsFn].some(Boolean)),
       distinctUntilChanged(),
       tap(() => this.loading$.next(true)),
       debounceTime(this.debounceTimeForCurrentEnvironment),
@@ -518,11 +492,9 @@ export class OpAutocompleterComponent<T extends IAutocompleteItem = IAutocomplet
     this.model = value;
   }
 
-  onChange = (_:T|T[]|null):void => {
-  };
+  onChange = (_:T|T[]|null):void => undefined;
 
-  onTouched = (_:T|T[]|null):void => {
-  };
+  onTouched = (_:T|T[]|null):void => undefined;
 
   registerOnChange(fn:(_:T|T[]|null) => void):void {
     this.onChange = fn;
diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.spec.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.spec.ts
index 5b2f00691c4..58ad73324e2 100644
--- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.spec.ts
+++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.spec.ts
@@ -2,7 +2,7 @@ import type { Mock } from 'vitest';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { States } from 'core-app/core/states/states.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ChangeDetectionStrategy, Component, NO_ERRORS_SCHEMA } from '@angular/core';
 import { of, map } from 'rxjs';
 import { NgSelectModule } from '@ng-select/ng-select';
 
@@ -11,6 +11,15 @@ import { TOpAutocompleterResource } from './typings';
 import { By } from '@angular/platform-browser';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
+@Component({
+  selector: 'op-test-autocompleter',
+  template: '',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
+})
+class TestAutocompleterComponent extends OpAutocompleterComponent {
+}
+
 describe('autocompleter', () => {
   let fixture:ComponentFixture<OpAutocompleterComponent>;
   let getOptionsFnSpy:Mock;
@@ -86,7 +95,7 @@ describe('autocompleter', () => {
     fixture = TestBed.createComponent(OpAutocompleterComponent);
     getOptionsFnSpy = vi.fn().mockImplementation((searchTerm:string) => {
       return of(workPackagesStub).pipe(map((wps) => wps.filter((wp) => searchTerm !== '' && wp.subject.includes(searchTerm))));
-    });
+    }) as unknown as Mock;
 
     fixture.componentInstance.resource = 'work_packages' as TOpAutocompleterResource;
     fixture.componentInstance.filters = [];
@@ -330,3 +339,18 @@ describe('autocompleter', () => {
     });
   });
 });
+
+describe('derived autocompleter', () => {
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [TestAutocompleterComponent],
+      providers: [States, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
+    }).compileComponents();
+  });
+
+  it('provides shared autocompleter dependencies to subclasses', () => {
+    const fixture = TestBed.createComponent(TestAutocompleterComponent);
+
+    expect(fixture.componentInstance.opAutocompleterService).toBeDefined();
+  });
+});
diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts
index ab94f9c5c13..e530ea441c9 100644
--- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts
+++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ApiV3FilterBuilder } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder';
 import { map } from 'rxjs/operators';
 import { ApiV3ResourceCollection } from 'core-app/core/apiv3/paths/apiv3-resource';
@@ -20,15 +20,11 @@ import { addFiltersToPath } from 'core-app/core/apiv3/helpers/add-filters-to-pat
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { CollectionResource } from 'core-app/features/hal/resources/collection-resource';
 
-@Injectable()
-
+@Injectable({ providedIn: 'root' })
 export class OpAutocompleterService extends UntilDestroyedMixin {
-  constructor(
-    private apiV3Service:ApiV3Service,
-    private halResourceService:HalResourceService,
-  ) {
-    super();
-  }
+  private apiV3Service = inject(ApiV3Service);
+  private halResourceService = inject(HalResourceService);
+
 
   // A method for fetching data with different resource type and different filter
   public loadAvailable(matching:string, resource:TOpAutocompleterResource, filters?:IAPIFilter[], searchKey?:string):Observable<HalResource[]> {
@@ -98,7 +94,7 @@ export class OpAutocompleterService extends UntilDestroyedMixin {
     switch (resource) {
       // in this case we can add more functions for fetching usual resources
       default: {
-        return this.loadAvailable(matching || '', resource, filters, searchKey);
+        return this.loadAvailable(matching ?? '', resource, filters, searchKey);
       }
     }
   }
@@ -111,7 +107,7 @@ export class OpAutocompleterService extends UntilDestroyedMixin {
       return of([]);
     }
 
-    const finalFilters:ApiV3FilterBuilder = this.createFilters(filters ?? [], matching || '', searchKey);
+    const finalFilters:ApiV3FilterBuilder = this.createFilters(filters ?? [], matching ?? '', searchKey);
     const params = this.createParams(resource);
 
     const stringifiedBuiltOutUrl = addFiltersToPath(url, finalFilters, params).toString();
diff --git a/frontend/src/app/shared/components/autocompleter/project-phase-autocompleter/project-phase-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/project-phase-autocompleter/project-phase-autocompleter.component.ts
index 7dcc3930834..40be5a99b6a 100644
--- a/frontend/src/app/shared/components/autocompleter/project-phase-autocompleter/project-phase-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/project-phase-autocompleter/project-phase-autocompleter.component.ts
@@ -28,7 +28,7 @@
  * ++
  */
 
-import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { CreateAutocompleterComponent } from '../create-autocompleter/create-autocompleter.component';
 import { opPhaseIconData, toDOMString } from '@openproject/octicons-angular';
 import { ProjectPhaseResource } from 'core-app/features/hal/resources/project-phase-resource';
@@ -49,8 +49,8 @@ export class ProjectPhaseAutocompleterComponent extends CreateAutocompleterCompo
 
   public phaseIcon:SafeHtml;
 
-  constructor(readonly injector:Injector) {
-    super(injector);
+  constructor() {
+    super();
 
     this.phaseIcon = this.sanitizer.bypassSecurityTrustHtml(toDOMString(opPhaseIconData, 'small', { 'aria-hidden': 'true', class: 'octicon' }));
   }
diff --git a/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts
index aa97fa5a4e4..2d7a558a3db 100644
--- a/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Injector, Input, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Injector, Input, TemplateRef, ViewChild, inject } from '@angular/core';
 import {
   IAutocompleterTemplateComponent,
   OpAutocompleterComponent,
@@ -41,6 +41,8 @@ import {
   standalone: false,
 })
 export class TimeEntriesWorkPackageAutocompleterTemplateComponent implements IAutocompleterTemplateComponent {
+  readonly injector = inject(Injector);
+
   @Input() public mode:string|undefined;
   @Input() public isOpenedInModal = false;
   @Input() public hoverCards = true;
@@ -48,9 +50,4 @@ export class TimeEntriesWorkPackageAutocompleterTemplateComponent implements IAu
   @ViewChild('headerTemplate') headerTemplate:TemplateRef<Element>;
 
   autocompleter:TimeEntriesWorkPackageAutocompleterComponent = this.injector.get(OpAutocompleterComponent) as TimeEntriesWorkPackageAutocompleterComponent;
-
-  constructor(
-    readonly injector:Injector,
-  ) {
-  }
 }
diff --git a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts
index 4dfaa168765..7857c5e99d5 100644
--- a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, TemplateRef, ViewChild, inject } from '@angular/core';
 import {
   IAutocompleterTemplateComponent,
 } from 'core-app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component';
@@ -41,12 +41,12 @@ import { hrefFromPrincipal, typeFromHref } from 'core-app/shared/components/prin
   standalone: false,
 })
 export class UserAutocompleterTemplateComponent implements IAutocompleterTemplateComponent {
+  private readonly pathHelperService = inject(PathHelperService);
+
   @Input() public inviteUserToProject:string|undefined;
   @Input() public isOpenedInModal = false;
   @Input() public hoverCards = true;
 
-  constructor(private readonly pathHelperService:PathHelperService) {}
-
   @ViewChild('optionTemplate') optionTemplate:TemplateRef<Element>;
   @ViewChild('footerTemplate') footerTemplate?:TemplateRef<Element>;
 
diff --git a/frontend/src/app/shared/components/autocompleter/version-autocompleter/version-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/version-autocompleter/version-autocompleter.component.ts
index 531947a644d..244df7f93e5 100644
--- a/frontend/src/app/shared/components/autocompleter/version-autocompleter/version-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/version-autocompleter/version-autocompleter.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Injector,
-  Output,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Output, inject } from '@angular/core';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { CreateAutocompleterComponent } from 'core-app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -52,6 +44,13 @@ import { firstValueFrom } from 'rxjs';
   standalone: false,
 })
 export class VersionAutocompleterComponent extends CreateAutocompleterComponent implements AfterViewInit {
+  readonly I18n = inject(I18nService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly pathHelper = inject(PathHelperService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly halNotification = inject(HalResourceNotificationService);
+
   @Output() public onCreate = new EventEmitter<VersionResource>();
 
   groupByFn = (item:HalResource):string|null => {
@@ -60,18 +59,6 @@ export class VersionAutocompleterComponent extends CreateAutocompleterComponent
     return project?.name || this.I18n.t('js.project.not_available');
   };
 
-  constructor(
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly currentProject:CurrentProjectService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly pathHelper:PathHelperService,
-    readonly apiV3Service:ApiV3Service,
-    readonly halNotification:HalResourceNotificationService,
-  ) {
-    super(injector);
-  }
-
   ngAfterViewInit() {
     super.ngAfterViewInit();
 
diff --git a/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts b/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts
index a3a2eaedac5..0132888898c 100644
--- a/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts
+++ b/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts
@@ -26,11 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 export type BreadcrumbItem =
@@ -45,13 +41,11 @@ export type BreadcrumbItem =
   standalone: false,
 })
 export class OpBreadcrumbsComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() items:BreadcrumbItem[] = [];
   @Input() lastItemSection?:string | null = null;
 
-  constructor(
-    readonly I18n:I18nService,
-  ) { }
-
   text = {
     breadcrumb: this.I18n.t('js.breadcrumb'),
   };
diff --git a/frontend/src/app/shared/components/colors/colors-autocompleter.component.ts b/frontend/src/app/shared/components/colors/colors-autocompleter.component.ts
index 01996e13690..8850aee5a30 100644
--- a/frontend/src/app/shared/components/colors/colors-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/colors/colors-autocompleter.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, inject } from '@angular/core';
 import {
   Highlighting,
 } from 'core-app/features/work-packages/components/wp-fast-table/builders/highlighting/highlighting.functions';
@@ -62,6 +62,9 @@ interface ColorItem {
   standalone: false,
 })
 export class ColorsAutocompleterComponent implements OnInit {
+  protected elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  protected readonly I18n = inject(I18nService);
+
   public options:ColorItem[];
 
   public selectedOption?:ColorItem|string;
@@ -74,12 +77,6 @@ export class ColorsAutocompleterComponent implements OnInit {
 
   private selectedColorId:string;
 
-  constructor(
-    protected elementRef:ElementRef<HTMLElement>,
-    protected readonly I18n:I18nService,
-  ) {
-  }
-
   ngOnInit() {
     this.setColorOptions();
 
diff --git a/frontend/src/app/shared/components/copy-to-clipboard/copy-to-clipboard.service.ts b/frontend/src/app/shared/components/copy-to-clipboard/copy-to-clipboard.service.ts
index 751f45f9c65..175aba389db 100644
--- a/frontend/src/app/shared/components/copy-to-clipboard/copy-to-clipboard.service.ts
+++ b/frontend/src/app/shared/components/copy-to-clipboard/copy-to-clipboard.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -34,10 +34,9 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   providedIn: 'root',
 })
 export class CopyToClipboardService {
-  constructor(
-    readonly toastService:ToastService,
-    readonly I18n:I18nService,
-  ) { }
+  readonly toastService = inject(ToastService);
+  readonly I18n = inject(I18nService);
+
 
   copy(content:string, successMessage?:string) {
     if (!navigator.clipboard) {
diff --git a/frontend/src/app/shared/components/date/op-date-time.component.ts b/frontend/src/app/shared/components/date/op-date-time.component.ts
index 4020cd79f35..281c8366de7 100644
--- a/frontend/src/app/shared/components/date/op-date-time.component.ts
+++ b/frontend/src/app/shared/components/date/op-date-time.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 
 @Component({
@@ -45,15 +45,14 @@ import { TimezoneService } from 'core-app/core/datetime/timezone.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class OpDateTimeComponent implements OnInit {
+  readonly timezoneService = inject(TimezoneService);
+
   @Input() dateTimeValue:any;
 
   public date:any;
 
   public time:any;
 
-  constructor(readonly timezoneService:TimezoneService) {
-  }
-
   ngOnInit() {
     const c = this.timezoneService.formattedDatetimeComponents(this.dateTimeValue);
     this.date = c[0];
diff --git a/frontend/src/app/shared/components/datepicker/basic-datepicker.module.ts b/frontend/src/app/shared/components/datepicker/basic-datepicker.module.ts
index 498dcfd7b27..229f0ac5cb0 100644
--- a/frontend/src/app/shared/components/datepicker/basic-datepicker.module.ts
+++ b/frontend/src/app/shared/components/datepicker/basic-datepicker.module.ts
@@ -1,4 +1,4 @@
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
 
@@ -28,6 +28,5 @@ import { OpBasicSingleDatePickerComponent } from './basic-single-date-picker/bas
   ],
 })
 export class OpBasicDatePickerModule {
-  constructor(readonly injector:Injector) {
-  }
+  readonly injector = inject(Injector);
 }
diff --git a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts
index dc707ceafcf..7e62b029ccd 100644
--- a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts
+++ b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts
@@ -26,22 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  HostBinding,
-  Injector,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, HostBinding, Injector, Input, OnInit, Output, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   ControlValueAccessor,
@@ -81,6 +66,13 @@ export const opBasicRangeDatePickerSelector = 'op-basic-range-date-picker';
   standalone: false,
 })
 export class OpBasicRangeDatePickerComponent implements OnInit, ControlValueAccessor, AfterViewInit {
+  readonly I18n = inject(I18nService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly injector = inject(Injector);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly elementRef = inject(ElementRef);
+  readonly deviceService = inject(DeviceService);
+
   @HostBinding('class.op-basic-range-datepicker') className = true;
 
   @HostBinding('class.op-basic-range-datepicker_mobile') mobile = false;
@@ -133,14 +125,7 @@ export class OpBasicRangeDatePickerComponent implements OnInit, ControlValueAcce
     spacer: this.I18n.t('js.filter.value_spacer'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService,
-    readonly injector:Injector,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-    readonly deviceService:DeviceService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts
index 8265e6969b2..b4f3a1da95d 100644
--- a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts
+++ b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts
@@ -26,22 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  Injector,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, Injector, Input, OnDestroy, OnInit, Output, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { onDayCreate, validDate } from 'core-app/shared/components/datepicker/helpers/date-modal.helpers';
@@ -67,6 +52,13 @@ import { DeviceService } from 'core-app/core/browser/device.service';
   standalone: false,
 })
 export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, OnInit, AfterViewInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly injector = inject(Injector);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly elementRef = inject(ElementRef);
+  readonly deviceService = inject(DeviceService);
+
   @Output() valueChange = new EventEmitter();
 
   @Output() picked = new EventEmitter();
@@ -112,14 +104,7 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O
 
   public datePickerInstance:DatePicker;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService,
-    readonly injector:Injector,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-    readonly deviceService:DeviceService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/datepicker/modal-single-date-picker/modal-single-date-picker.component.ts b/frontend/src/app/shared/components/datepicker/modal-single-date-picker/modal-single-date-picker.component.ts
index 0000790accc..2d005a4c06a 100644
--- a/frontend/src/app/shared/components/datepicker/modal-single-date-picker/modal-single-date-picker.component.ts
+++ b/frontend/src/app/shared/components/datepicker/modal-single-date-picker/modal-single-date-picker.component.ts
@@ -26,21 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterContentInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  Injector,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterContentInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, Injector, Input, OnInit, Output, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { onDayCreate, parseDate, setDates } from 'core-app/shared/components/datepicker/helpers/date-modal.helpers';
@@ -73,6 +59,13 @@ import {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class OpModalSingleDatePickerComponent implements ControlValueAccessor, OnInit, AfterContentInit {
+  readonly I18n = inject(I18nService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly injector = inject(Injector);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly elementRef = inject(ElementRef);
+  readonly spotDropModalTeleportationService = inject(SpotDropModalTeleportationService);
+
   @Output() closed = new EventEmitter();
 
   @Output() valueChange = new EventEmitter();
@@ -145,14 +138,7 @@ export class OpModalSingleDatePickerComponent implements ControlValueAccessor, O
     },
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService,
-    readonly injector:Injector,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-    readonly spotDropModalTeleportationService:SpotDropModalTeleportationService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/datepicker/sheet/date-picker-sheet.component.ts b/frontend/src/app/shared/components/datepicker/sheet/date-picker-sheet.component.ts
index 7f465d6c187..5bb03cd965d 100644
--- a/frontend/src/app/shared/components/datepicker/sheet/date-picker-sheet.component.ts
+++ b/frontend/src/app/shared/components/datepicker/sheet/date-picker-sheet.component.ts
@@ -26,22 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostBinding,
-  Injector,
-  Input,
-  OnChanges,
-  Output,
-  SimpleChanges,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, Injector, Input, OnChanges, Output, SimpleChanges, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { onDayCreate } from 'core-app/shared/components/datepicker/helpers/date-modal.helpers';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
@@ -61,6 +46,13 @@ import { DeviceService } from 'core-app/core/browser/device.service';
   standalone: false,
 })
 export class OpDatePickerSheetComponent implements AfterViewInit, OnChanges {
+  readonly I18n = inject(I18nService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly injector = inject(Injector);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly elementRef = inject(ElementRef);
+  readonly deviceService = inject(DeviceService);
+
   @HostBinding('class.op-datepicker-sheet') className = true;
 
   @Input() dates:string[];
@@ -77,16 +69,6 @@ export class OpDatePickerSheetComponent implements AfterViewInit, OnChanges {
 
   datePickerInstance:DatePicker;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService,
-    readonly injector:Injector,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-    readonly deviceService:DeviceService,
-  ) {
-  }
-
   ngAfterViewInit():void {
     this.initializeDatepicker();
   }
diff --git a/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker-instance.component.ts b/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker-instance.component.ts
index 927728c5fa3..3f764fc6e5a 100644
--- a/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker-instance.component.ts
+++ b/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker-instance.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Injector,
-  Input,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector, Input, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { DayElement } from 'flatpickr/dist/types/instance';
@@ -65,6 +56,15 @@ export type DateMode = 'single'|'range';
   standalone: false,
 })
 export class OpWpDatePickerInstanceComponent extends UntilDestroyedMixin implements AfterViewInit {
+  readonly injector = inject(Injector);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly I18n = inject(I18nService);
+  readonly timezoneService = inject(TimezoneService);
+  readonly deviceService = inject(DeviceService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly elementRef = inject(ElementRef);
+
   @Input() public ignoreNonWorkingDays:boolean;
   @Input() public scheduleManually:boolean;
 
@@ -89,16 +89,7 @@ export class OpWpDatePickerInstanceComponent extends UntilDestroyedMixin impleme
   private minimalSchedulingDate:Date|null;
   private onFlatpickrSetValuesBound = this.onFlatpickrSetValues.bind(this);
 
-  constructor(
-    readonly injector:Injector,
-    readonly cdRef:ChangeDetectorRef,
-    readonly apiV3Service:ApiV3Service,
-    readonly I18n:I18nService,
-    readonly timezoneService:TimezoneService,
-    readonly deviceService:DeviceService,
-    readonly pathHelper:PathHelperService,
-    readonly elementRef:ElementRef,
-  ) {
+  constructor() {
     super();
     populateInputsFromDataset(this);
     this.startDateValue = this.toDate(this.startDate);
diff --git a/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker.modal.ts b/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker.modal.ts
index 81de6192148..a8a7ec2e508 100644
--- a/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker.modal.ts
+++ b/frontend/src/app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker.modal.ts
@@ -26,18 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 
 @Component({
@@ -46,19 +37,12 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class OpWpDatePickerModalComponent extends OpModalComponent implements OnInit {
+  readonly pathHelper = inject(PathHelperService);
+
   turboFrameSrc:string;
 
   showCloseButton = false;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly pathHelper:PathHelperService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit() {
     super.ngOnInit();
     this.updateFrameSrc();
diff --git a/frontend/src/app/shared/components/editable-toolbar-title/editable-toolbar-title.component.ts b/frontend/src/app/shared/components/editable-toolbar-title/editable-toolbar-title.component.ts
index e66895b3706..4ca4b9e7364 100644
--- a/frontend/src/app/shared/components/editable-toolbar-title/editable-toolbar-title.component.ts
+++ b/frontend/src/app/shared/components/editable-toolbar-title/editable-toolbar-title.component.ts
@@ -25,21 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostBinding,
-  Injector,
-  Input,
-  OnChanges,
-  OnInit,
-  Output,
-  SimpleChanges,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, Injector, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { whenOutside } from 'core-app/shared/directives/focus/contain-helpers';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
@@ -58,6 +44,9 @@ export const selectableTitleIdentifier = 'editable-toolbar-title';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class EditableToolbarTitleComponent implements OnInit, OnChanges {
+  readonly injector = inject(Injector);
+  private cdRef = inject(ChangeDetectorRef);
+
   @Input('title') public inputTitle:string;
 
   @Input() public editable = true;
@@ -101,9 +90,6 @@ export class EditableToolbarTitleComponent implements OnInit, OnChanges {
     duplicate_query_title: this.I18n.t('js.work_packages.query.errors.duplicate_query_title'),
   };
 
-  constructor(readonly injector:Injector, private cdRef:ChangeDetectorRef) {
-  }
-
   ngOnInit():void {
     this.text.input_title = `${this.text.click_to_edit} ${this.text.press_enter_to_save}`;
 
diff --git a/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts b/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts
index fdb978ca243..f66cd491fad 100644
--- a/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts
+++ b/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
@@ -66,6 +57,13 @@ import { attributeTokenList, ensureId } from 'core-app/shared/helpers/dom-helper
   standalone: false,
 })
 export class CkeditorAugmentedTextareaComponent extends UntilDestroyedMixin implements OnInit {
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  protected pathHelper = inject(PathHelperService);
+  protected halResourceService = inject(HalResourceService);
+  protected Notifications = inject(ToastService);
+  protected I18n = inject(I18nService);
+  protected states = inject(States);
+
   // Track form submission "in-flight" state per form, to prevent multiple
   // submissions from multiple CKEditor instances on the same form.
   private static inFlight = new WeakMap<HTMLFormElement, boolean>();
@@ -135,14 +133,7 @@ export class CkeditorAugmentedTextareaComponent extends UntilDestroyedMixin impl
 
   private labelClickSubscription:Subscription;
 
-  constructor(
-    readonly elementRef:ElementRef<HTMLElement>,
-    protected pathHelper:PathHelperService,
-    protected halResourceService:HalResourceService,
-    protected Notifications:ToastService,
-    protected I18n:I18nService,
-    protected states:States,
-  ) {
+  constructor() {
     super();
     populateInputsFromDataset(this);
   }
diff --git a/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-preview.service.ts b/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-preview.service.ts
index c9907c3507e..b4458c945df 100644
--- a/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-preview.service.ts
+++ b/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-preview.service.ts
@@ -26,16 +26,14 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ApplicationRef, ComponentFactoryResolver, ComponentRef, Injectable, Injector } from '@angular/core';
+import { ApplicationRef, ComponentFactoryResolver, ComponentRef, Injectable, Injector, inject } from '@angular/core';
 
 @Injectable()
 export class CKEditorPreviewService {
-  constructor(
-    private readonly componentFactoryResolver:ComponentFactoryResolver,
-    private readonly appRef:ApplicationRef,
-    private readonly injector:Injector,
-  ) {
-  }
+  private readonly componentFactoryResolver = inject(ComponentFactoryResolver);
+  private readonly appRef = inject(ApplicationRef);
+  private readonly injector = inject(Injector);
+
 
   /**
    * Render preview into the given element, return a remover function to disconnect all
diff --git a/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-setup.service.ts b/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-setup.service.ts
index deaa4c7f0fd..1dc058140f8 100644
--- a/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-setup.service.ts
+++ b/frontend/src/app/shared/components/editor/components/ckeditor/ckeditor-setup.service.ts
@@ -1,5 +1,5 @@
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   ICKEditorContext,
   ICKEditorStatic,
@@ -21,18 +21,15 @@ declare global {
 
 @Injectable()
 export class CKEditorSetupService {
+  readonly PathHelper = inject(PathHelperService);
+  readonly configurationService = inject(ConfigurationService);
+
   /** The language CKEditor was able to load, falls back to 'en' */
   private loadedLocale = 'en';
 
   /** Prefetch ckeditor when browser is idle */
   private prefetch:Promise<unknown>;
 
-  constructor(
-    readonly PathHelper:PathHelperService,
-    readonly configurationService:ConfigurationService,
-    ) {
-  }
-
   public initialize() {
     this.prefetch = this.load();
     this.watchTopLayer();
diff --git a/frontend/src/app/shared/components/editor/openproject-editor.module.ts b/frontend/src/app/shared/components/editor/openproject-editor.module.ts
index c08d0c72403..6bf4c068b25 100644
--- a/frontend/src/app/shared/components/editor/openproject-editor.module.ts
+++ b/frontend/src/app/shared/components/editor/openproject-editor.module.ts
@@ -86,6 +86,4 @@ export function initializeServices(injector:Injector) {
   ],
 })
 export class OpenprojectEditorModule {
-  constructor(injector:Injector) {
-  }
 }
diff --git a/frontend/src/app/shared/components/fields/display/display-field.component.ts b/frontend/src/app/shared/components/fields/display/display-field.component.ts
index 75d57f6ef69..bb95ee5a530 100644
--- a/frontend/src/app/shared/components/fields/display/display-field.component.ts
+++ b/frontend/src/app/shared/components/fields/display/display-field.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, ElementRef, Injector, Input, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Injector, Input, OnInit, ViewChild, inject } from '@angular/core';
 import { IFieldSchema } from 'core-app/shared/components/fields/field.base';
 import { DisplayFieldService } from 'core-app/shared/components/fields/display/display-field.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
@@ -14,6 +14,10 @@ import { SchemaResource } from 'core-app/features/hal/resources/schema-resource'
   standalone: false,
 })
 export class DisplayFieldComponent implements OnInit {
+  private injector = inject(Injector);
+  private displayFieldService = inject(DisplayFieldService);
+  private schemaCache = inject(SchemaCacheService);
+
   @Input() resource:HalResource;
 
   @Input() fieldName:string;
@@ -26,13 +30,6 @@ export class DisplayFieldComponent implements OnInit {
 
   @ViewChild('displayFieldContainer') container:ElementRef<HTMLSpanElement>;
 
-  constructor(
-    private injector:Injector,
-    private displayFieldService:DisplayFieldService,
-    private schemaCache:SchemaCacheService,
-  ) {
-  }
-
   ngOnInit():void {
     void this.schemaCache
       .ensureLoaded(this.resource)
diff --git a/frontend/src/app/shared/components/fields/display/field-types/excluded-icon-helper.service.ts b/frontend/src/app/shared/components/fields/display/field-types/excluded-icon-helper.service.ts
index 8f7cd1008c5..2e7bd4c8571 100644
--- a/frontend/src/app/shared/components/fields/display/field-types/excluded-icon-helper.service.ts
+++ b/frontend/src/app/shared/components/fields/display/field-types/excluded-icon-helper.service.ts
@@ -26,16 +26,15 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { StatusResource } from 'core-app/features/hal/resources/status-resource';
 
 @Injectable({ providedIn: 'root' })
 export class ExcludedIconHelperService {
-  constructor(
-    private apiV3Service:ApiV3Service,
-  ) {}
+  private apiV3Service = inject(ApiV3Service);
+
 
   public addIconIfExcludedFromTotals(element:HTMLElement, resource:WorkPackageResource):void {
     if (resource?.status) {
diff --git a/frontend/src/app/shared/components/fields/display/field-types/hierarchy-query-link-helper.service.ts b/frontend/src/app/shared/components/fields/display/field-types/hierarchy-query-link-helper.service.ts
index d06bf3c97bb..17519fb45a6 100644
--- a/frontend/src/app/shared/components/fields/display/field-types/hierarchy-query-link-helper.service.ts
+++ b/frontend/src/app/shared/components/fields/display/field-types/hierarchy-query-link-helper.service.ts
@@ -26,16 +26,15 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import URI from 'urijs';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 
 @Injectable({ providedIn: 'root' })
 export class HierarchyQueryLinkHelperService {
-  constructor(
-    private pathHelper:PathHelperService,
-  ) {}
+  private pathHelper = inject(PathHelperService);
+
 
   public addHref(link:HTMLAnchorElement, resource:HalResource):void {
     if (resource && resource.id) {
diff --git a/frontend/src/app/shared/components/fields/display/info/op-exclusion-info.component.ts b/frontend/src/app/shared/components/fields/display/info/op-exclusion-info.component.ts
index 0fba50d837e..a59b4c5373a 100644
--- a/frontend/src/app/shared/components/fields/display/info/op-exclusion-info.component.ts
+++ b/frontend/src/app/shared/components/fields/display/info/op-exclusion-info.component.ts
@@ -28,13 +28,7 @@
  * ++
  */
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 @Component({
@@ -45,6 +39,9 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   standalone: false,
 })
 export class OpExclusionInfoComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   public opened = false;
 
   @Input() public statusName:string;
@@ -55,11 +52,6 @@ export class OpExclusionInfoComponent implements OnInit {
     buttonClose: this.I18n.t('js.button_close'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {}
-
   ngOnInit() {
     this.text.modalContent = this.I18n.t('js.exclusion_info.modal.content', { status_name: this.statusName || '' });
   }
diff --git a/frontend/src/app/shared/components/fields/edit/edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/edit-field.component.ts
index 273afd45014..519c506f13e 100644
--- a/frontend/src/app/shared/components/fields/edit/edit-field.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/edit-field.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectorRef,
-  Directive,
-  ElementRef,
-  Inject,
-  InjectionToken,
-  Injector,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectorRef, Directive, ElementRef, InjectionToken, Injector, OnDestroy, OnInit, inject } from '@angular/core';
 import { EditFieldHandler } from 'core-app/shared/components/fields/edit/editing-portal/edit-field-handler';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { Field, IFieldSchema } from 'core-app/shared/components/fields/field.base';
@@ -53,21 +44,23 @@ export const editModeClassName = '-editing';
 
 @Directive()
 export abstract class EditFieldComponent extends Field implements OnInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly elementRef = inject(ElementRef);
+  protected change = inject<ResourceChangeset<HalResource>>(OpEditingPortalChangesetToken);
+  schema = inject<IFieldSchema>(OpEditingPortalSchemaToken);
+  readonly handler = inject<EditFieldHandler>(OpEditingPortalHandlerToken);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly injector = inject(Injector);
+
   /** Self reference */
   public self = this;
 
   protected element:HTMLElement;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    @Inject(OpEditingPortalChangesetToken) protected change:ResourceChangeset<HalResource>,
-    @Inject(OpEditingPortalSchemaToken) public schema:IFieldSchema,
-    @Inject(OpEditingPortalHandlerToken) readonly handler:EditFieldHandler,
-    readonly cdRef:ChangeDetectorRef,
-    readonly injector:Injector,
-  ) {
+  constructor() {
     super();
+    const change = this.change;
+
 
     this.updateFromChangeset(change);
   }
diff --git a/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts b/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts
index 4739667235a..5897a8faa79 100644
--- a/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts
@@ -26,20 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ApplicationRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Injector,
-  Input,
-  OnDestroy,
-  OnInit,
-  Optional,
-  Output,
-} from '@angular/core';
+import { ApplicationRef, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Injector, Input, OnDestroy, OnInit, Output, inject } from '@angular/core';
 import { StateService, Transition, TransitionService } from '@uirouter/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { EditableAttributeFieldComponent } from 'core-app/shared/components/fields/edit/field/editable-attribute-field.component';
@@ -70,6 +57,18 @@ import { firstValueFrom } from 'rxjs';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class EditFormComponent extends EditForm<HalResource> implements OnInit, OnDestroy {
+  readonly injector:Injector;
+  protected readonly elementRef = inject(ElementRef);
+  private appRef = inject(ApplicationRef);
+  private readonly cdRef = inject(ChangeDetectorRef);
+  protected readonly $transitions = inject(TransitionService);
+  protected readonly configurationService = inject(ConfigurationService);
+  protected readonly editingPortalService = inject(EditingPortalService);
+  protected readonly $state = inject(StateService);
+  protected readonly I18n = inject(I18nService);
+  protected readonly editFormRouting = inject(EditFormRoutingService, { optional: true });
+  private globalEditFormChangesTrackerService = inject(GlobalEditFormChangesTrackerService);
+
   @Input() resource:HalResource;
 
   @Input('inEditMode') initializeEditMode = false;
@@ -84,20 +83,16 @@ export class EditFormComponent extends EditForm<HalResource> implements OnInit,
 
   private unregisterListener:Function;
 
-  constructor(public readonly injector:Injector,
-    protected readonly elementRef:ElementRef,
-    private appRef:ApplicationRef,
-    private readonly cdRef:ChangeDetectorRef,
-    protected readonly $transitions:TransitionService,
-    protected readonly ConfigurationService:ConfigurationService,
-    protected readonly editingPortalService:EditingPortalService,
-    protected readonly $state:StateService,
-    protected readonly I18n:I18nService,
-    @Optional() protected readonly editFormRouting:EditFormRoutingService,
-    private globalEditFormChangesTrackerService:GlobalEditFormChangesTrackerService) {
+  constructor() {
+    const injector = inject(Injector);
+
     super(injector);
+    this.injector = injector;
+    const $transitions = this.$transitions;
+    const I18n = this.I18n;
+
     const confirmText = I18n.t('js.work_packages.confirm_edit_cancel');
-    const requiresConfirmation = ConfigurationService.warnOnLeavingUnsaved();
+    const requiresConfirmation = this.configurationService.warnOnLeavingUnsaved();
 
     this.unregisterListener = $transitions.onBefore({}, (transition:Transition) => {
       if (!this.editing) {
diff --git a/frontend/src/app/shared/components/fields/edit/editing-portal/edit-form-portal.component.ts b/frontend/src/app/shared/components/fields/edit/editing-portal/edit-form-portal.component.ts
index 10502c89c9a..fb336e1542d 100644
--- a/frontend/src/app/shared/components/fields/edit/editing-portal/edit-form-portal.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/editing-portal/edit-form-portal.component.ts
@@ -1,16 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Injector,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Injector, Input, OnDestroy, OnInit, Output, inject } from '@angular/core';
 import { EditFieldHandler } from 'core-app/shared/components/fields/edit/editing-portal/edit-field-handler';
 import { HalResourceEditFieldHandler } from 'core-app/shared/components/fields/edit/field-handler/hal-resource-edit-field-handler';
 import { takeUntil } from 'rxjs/operators';
@@ -34,6 +22,11 @@ import { ResourceChangeset } from 'core-app/shared/components/fields/changeset/r
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class EditFormPortalComponent implements OnInit, OnDestroy, AfterViewInit {
+  readonly injector = inject(Injector);
+  readonly editField = inject(EditFieldService);
+  readonly elementRef = inject(ElementRef);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() schemaInput:IFieldSchema;
 
   @Input() changeInput:ResourceChangeset;
@@ -56,13 +49,6 @@ export class EditFormPortalComponent implements OnInit, OnDestroy, AfterViewInit
 
   public label:string;
 
-  constructor(
-    readonly injector:Injector,
-    readonly editField:EditFieldService,
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-  ) { }
-
   ngOnInit() {
     if (this.editFieldHandler && this.schemaInput) {
       this.handler = this.editFieldHandler;
diff --git a/frontend/src/app/shared/components/fields/edit/editing-portal/editing-portal-service.ts b/frontend/src/app/shared/components/fields/edit/editing-portal/editing-portal-service.ts
index d1afb5eb3fd..7e66e1b0a95 100644
--- a/frontend/src/app/shared/components/fields/edit/editing-portal/editing-portal-service.ts
+++ b/frontend/src/app/shared/components/fields/edit/editing-portal/editing-portal-service.ts
@@ -1,9 +1,7 @@
 /**
  * A CDK portal implementation to wrap edit-fields in non-angular contexts.
  */
-import {
-  ApplicationRef, Injectable, Injector,
-} from '@angular/core';
+import { ApplicationRef, Injectable, Injector, inject } from '@angular/core';
 import { ComponentPortal, DomPortalOutlet } from '@angular/cdk/portal';
 import { EditFormPortalComponent } from 'core-app/shared/components/fields/edit/editing-portal/edit-form-portal.component';
 import { createLocalInjector } from 'core-app/shared/components/fields/edit/editing-portal/edit-form-portal.injector';
@@ -16,10 +14,9 @@ import { HalResourceEditFieldHandler } from 'core-app/shared/components/fields/e
 
 @Injectable({ providedIn: 'root' })
 export class EditingPortalService {
-  constructor(private readonly appRef:ApplicationRef,
-    private readonly pathHelper:PathHelperService) {
+  private readonly appRef = inject(ApplicationRef);
+  private readonly pathHelper = inject(PathHelperService);
 
-  }
 
   public create(container:HTMLElement,
     injector:Injector,
diff --git a/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts
index 4af523a4c40..a09f8cdfbc0 100644
--- a/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/field-types/date-picker-edit-field.component.ts
@@ -26,35 +26,22 @@
  *  See COPYRIGHT and LICENSE files for more details.
  */
 
-import {
-  ChangeDetectorRef,
-  Directive,
-  ElementRef,
-  Inject,
-  Injector,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { Directive, OnDestroy, OnInit, inject } from '@angular/core';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import {
   EditFieldComponent,
-  OpEditingPortalChangesetToken,
-  OpEditingPortalHandlerToken,
-  OpEditingPortalSchemaToken,
 } from 'core-app/shared/components/fields/edit/edit-field.component';
 import { DeviceService } from 'core-app/core/browser/device.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { ResourceChangeset } from 'core-app/shared/components/fields/changeset/resource-changeset';
-import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import { IFieldSchema } from 'core-app/shared/components/fields/field.base';
-import { EditFieldHandler } from 'core-app/shared/components/fields/edit/editing-portal/edit-field-handler';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { OpWpDatePickerModalComponent } from 'core-app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker.modal';
 
 @Directive()
 export abstract class DatePickerEditFieldComponent extends EditFieldComponent implements OnInit, OnDestroy {
+  readonly pathHelper = inject(PathHelperService);
+  readonly opModalService = inject(OpModalService);
+
   @InjectField() readonly timezoneService:TimezoneService;
 
   @InjectField() deviceService:DeviceService;
@@ -65,20 +52,6 @@ export abstract class DatePickerEditFieldComponent extends EditFieldComponent im
   private updateHandler:EventListener = this.handleSuccessfulUpdate.bind(this);
   private cancelHandler:EventListener = this.cancel.bind(this);
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    @Inject(OpEditingPortalChangesetToken) protected change:ResourceChangeset<HalResource>,
-    @Inject(OpEditingPortalSchemaToken) public schema:IFieldSchema,
-    @Inject(OpEditingPortalHandlerToken) readonly handler:EditFieldHandler,
-    readonly cdRef:ChangeDetectorRef,
-    readonly injector:Injector,
-    readonly pathHelper:PathHelperService,
-    readonly opModalService:OpModalService,
-  ) {
-    super(I18n, elementRef, change, schema, handler, cdRef, injector);
-  }
-
   ngOnInit():void {
     super.ngOnInit();
 
diff --git a/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts
index 831c159f5ec..6ba0193a241 100644
--- a/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts
@@ -28,27 +28,9 @@
  * ++
  */
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  Injector,
-  OnInit,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { ProgressEditFieldComponent } from 'core-app/shared/components/fields/edit/field-types/progress-edit-field.component';
-import { ResourceChangeset } from 'core-app/shared/components/fields/changeset/resource-changeset';
-import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import { IFieldSchema } from 'core-app/shared/components/fields/field.base';
-import { EditFieldHandler } from 'core-app/shared/components/fields/edit/editing-portal/edit-field-handler';
-import {
-  OpEditingPortalChangesetToken,
-  OpEditingPortalHandlerToken,
-  OpEditingPortalSchemaToken,
-} from 'core-app/shared/components/fields/edit/edit-field.component';
 import { HalEventsService } from 'core-app/features/hal/services/hal-events.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -61,6 +43,12 @@ import { TimezoneService } from 'core-app/core/datetime/timezone.service';
   standalone: false,
 })
 export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponent implements OnInit {
+  readonly pathHelper = inject(PathHelperService);
+  private halEvents = inject(HalEventsService);
+  private toastService = inject(ToastService);
+  private apiV3Service = inject(ApiV3Service);
+  private timezoneService = inject(TimezoneService);
+
   text = {
     title: this.I18n.t('js.work_packages.progress.title'),
     button_close: this.I18n.t('js.button_close'),
@@ -72,23 +60,6 @@ export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponen
 
   opened = false;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    @Inject(OpEditingPortalChangesetToken) protected change:ResourceChangeset<HalResource>,
-    @Inject(OpEditingPortalSchemaToken) public schema:IFieldSchema,
-    @Inject(OpEditingPortalHandlerToken) readonly handler:EditFieldHandler,
-    readonly cdRef:ChangeDetectorRef,
-    readonly injector:Injector,
-    readonly pathHelper:PathHelperService,
-    private halEvents:HalEventsService,
-    private toastService:ToastService,
-    private apiV3Service:ApiV3Service,
-    private timezoneService:TimezoneService,
-  ) {
-    super(I18n, elementRef, change, schema, handler, cdRef, injector);
-  }
-
   ngOnInit() {
     super.ngOnInit();
     /*
diff --git a/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts
index f186542b2c9..f33d2c95cb7 100644
--- a/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts
@@ -26,31 +26,14 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  Injector,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { from } from 'rxjs';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   EditFieldComponent,
-  OpEditingPortalChangesetToken,
-  OpEditingPortalHandlerToken,
-  OpEditingPortalSchemaToken,
 } from 'core-app/shared/components/fields/edit/edit-field.component';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { IProject } from 'core-app/core/state/projects/project.model';
-import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import { ResourceChangeset } from '../../changeset/resource-changeset';
-import { IFieldSchema } from '../../field.base';
-import { EditFieldHandler } from '../editing-portal/edit-field-handler';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { take, tap } from 'rxjs/operators';
 import isNewResource from 'core-app/features/hal/helpers/is-new-resource';
@@ -66,33 +49,14 @@ import { FilterOperator } from 'core-app/shared/helpers/api-v3/api-v3-filter-bui
   standalone: false,
 })
 export class ProjectEditFieldComponent extends EditFieldComponent implements OnInit {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly http = inject(HttpClient);
+  readonly halResourceService = inject(HalResourceService);
+
   isNew = isNewResource(this.resource);
 
   url:string;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    @Inject(OpEditingPortalChangesetToken) protected change:ResourceChangeset<HalResource>,
-    @Inject(OpEditingPortalSchemaToken) public schema:IFieldSchema,
-    @Inject(OpEditingPortalHandlerToken) readonly handler:EditFieldHandler,
-    readonly cdRef:ChangeDetectorRef,
-    readonly injector:Injector,
-    readonly apiV3Service:ApiV3Service,
-    readonly http:HttpClient,
-    readonly halResourceService:HalResourceService,
-  ) {
-    super(
-      I18n,
-      elementRef,
-      change,
-      schema,
-      handler,
-      cdRef,
-      injector,
-    );
-  }
-
   initialize():void {
     if (this.schema.allowedValues) {
       this.setUrl();
diff --git a/frontend/src/app/shared/components/fields/edit/field-types/user-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/user-edit-field.component.ts
index f74f1ffb4a8..e1e3899c8a1 100644
--- a/frontend/src/app/shared/components/fields/edit/field-types/user-edit-field.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/field-types/user-edit-field.component.ts
@@ -26,29 +26,12 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  Injector,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   EditFieldComponent,
-  OpEditingPortalChangesetToken,
-  OpEditingPortalHandlerToken,
-  OpEditingPortalSchemaToken,
 } from 'core-app/shared/components/fields/edit/edit-field.component';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
-// import { IProject } from 'core-app/core/state/projects/project.model';
-import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import { ResourceChangeset } from '../../changeset/resource-changeset';
-import { IFieldSchema } from '../../field.base';
-import { EditFieldHandler } from '../editing-portal/edit-field-handler';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import isNewResource from 'core-app/features/hal/helpers/is-new-resource';
 import { IUserAutocompleteItem } from 'core-app/shared/components/autocompleter/user-autocompleter/user-autocompleter.component';
@@ -60,33 +43,14 @@ import { CallableHalLink } from 'core-app/features/hal/hal-link/hal-link';
   standalone: false,
 })
 export class UserEditFieldComponent extends EditFieldComponent implements OnInit {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly http = inject(HttpClient);
+  readonly halResourceService = inject(HalResourceService);
+
   isNew = isNewResource(this.resource);
 
   url:string;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly elementRef:ElementRef,
-    @Inject(OpEditingPortalChangesetToken) protected change:ResourceChangeset<HalResource>,
-    @Inject(OpEditingPortalSchemaToken) public schema:IFieldSchema,
-    @Inject(OpEditingPortalHandlerToken) readonly handler:EditFieldHandler,
-    readonly cdRef:ChangeDetectorRef,
-    readonly injector:Injector,
-    readonly apiV3Service:ApiV3Service,
-    readonly http:HttpClient,
-    readonly halResourceService:HalResourceService,
-  ) {
-    super(
-      I18n,
-      elementRef,
-      change,
-      schema,
-      handler,
-      cdRef,
-      injector,
-    );
-  }
-
   initialize():void {
     const link = this.schema.allowedValues as CallableHalLink|undefined;
     if (link) {
diff --git a/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts b/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts
index 9b6d036a9c7..e1382bc5143 100644
--- a/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts
@@ -29,18 +29,7 @@
 import {
   HalResourceEditingService,
 } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Injector,
-  Input,
-  OnDestroy,
-  OnInit,
-  Optional,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector, Input, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { getPosition } from 'core-app/shared/helpers/set-click-position/set-click-position';
@@ -66,6 +55,16 @@ import { SchemaResource } from 'core-app/features/hal/resources/schema-resource'
   standalone: false,
 })
 export class EditableAttributeFieldComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  protected states = inject(States);
+  protected injector = inject(Injector);
+  protected elementRef = inject(ElementRef);
+  protected opContextMenu = inject(OPContextMenuService);
+  protected halEditing = inject(HalResourceEditingService);
+  protected schemaCache = inject(SchemaCacheService);
+  protected editForm = inject(EditFormComponent, { optional: true });
+  protected cdRef = inject(ChangeDetectorRef);
+  protected I18n = inject(I18nService);
+
   @Input() public fieldName:string;
 
   @Input() public resource:HalResource;
@@ -90,21 +89,6 @@ export class EditableAttributeFieldComponent extends UntilDestroyedMixin impleme
 
   public destroyed = false;
 
-  constructor(
-    protected states:States,
-    protected injector:Injector,
-    protected elementRef:ElementRef,
-    protected opContextMenu:OPContextMenuService,
-    protected halEditing:HalResourceEditingService,
-    protected schemaCache:SchemaCacheService,
-    // Get parent field group from injector if we're in a form
-    @Optional() protected editForm:EditFormComponent,
-    protected cdRef:ChangeDetectorRef,
-    protected I18n:I18nService,
-  ) {
-    super();
-  }
-
   public setActive(active = true):void {
     this.active = active;
     if (!this.componentDestroyed) {
@@ -197,7 +181,7 @@ export class EditableAttributeFieldComponent extends UntilDestroyedMixin impleme
     // Activate the field
     this.setActive(true);
 
-    return this.editForm
+    return this.editForm!
       .activate(this.fieldName, noWarnings)
       .catch(() => this.deactivate(true));
   }
diff --git a/frontend/src/app/shared/components/fields/edit/modal-with-turbo-content/modal-with-turbo-content.directive.ts b/frontend/src/app/shared/components/fields/edit/modal-with-turbo-content/modal-with-turbo-content.directive.ts
index 4e414e2b4e4..cb2192c2fb2 100644
--- a/frontend/src/app/shared/components/fields/edit/modal-with-turbo-content/modal-with-turbo-content.directive.ts
+++ b/frontend/src/app/shared/components/fields/edit/modal-with-turbo-content/modal-with-turbo-content.directive.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectorRef,
-  Directive,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnDestroy,
-  Output,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Directive, ElementRef, EventEmitter, Input, OnDestroy, Output, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { HalEventsService } from 'core-app/features/hal/services/hal-events.service';
@@ -49,6 +40,13 @@ import { ResourceChangeset } from 'core-app/shared/components/fields/changeset/r
   standalone: false,
 })
 export class ModalWithTurboContentDirective implements AfterViewInit, OnDestroy {
+  readonly elementRef = inject(ElementRef);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly halEvents = inject(HalEventsService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly toastService = inject(ToastService);
+  readonly I18n = inject(I18nService);
+
   @Input() resource:HalResource;
   @Input() change:ResourceChangeset<HalResource>;
 
@@ -60,17 +58,6 @@ export class ModalWithTurboContentDirective implements AfterViewInit, OnDestroy
   private preserveSegmentAttributesBound = this.preserveSegmentAttributes.bind(this);
   private cancelListenerBound = this.cancelListener.bind(this);
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-    readonly halEvents:HalEventsService,
-    readonly apiV3Service:ApiV3Service,
-    readonly toastService:ToastService,
-    readonly I18n:I18nService,
-  ) {
-
-  }
-
   ngAfterViewInit() {
     (this.elementRef.nativeElement as HTMLElement)
       .addEventListener('turbo:submit-end', this.contextBasedListenerBound);
diff --git a/frontend/src/app/shared/components/fields/edit/services/global-edit-form-changes-tracker/global-edit-form-changes-tracker.service.ts b/frontend/src/app/shared/components/fields/edit/services/global-edit-form-changes-tracker/global-edit-form-changes-tracker.service.ts
index 07fa4924aff..359dff8b6f0 100644
--- a/frontend/src/app/shared/components/fields/edit/services/global-edit-form-changes-tracker/global-edit-form-changes-tracker.service.ts
+++ b/frontend/src/app/shared/components/fields/edit/services/global-edit-form-changes-tracker/global-edit-form-changes-tracker.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-form/edit-form.component';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -6,15 +6,15 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   providedIn: 'root',
 })
 export class GlobalEditFormChangesTrackerService {
+  private i18nService = inject(I18nService);
+
   private activeForms = new Map<EditFormComponent, boolean>();
 
   get thereAreFormsWithUnsavedChanges() {
     return Array.from(this.activeForms.keys()).some((form) => !form.change.isEmpty());
   }
 
-  constructor(
-    private i18nService:I18nService,
-  ) {
+  constructor() {
     // Global beforeunload hook to show a data loss warn
     // when the user clicks on a link out of the Angular app
     window.addEventListener('beforeunload', (event) => {
diff --git a/frontend/src/app/shared/components/fields/edit/services/hal-resource-editing.service.ts b/frontend/src/app/shared/components/fields/edit/services/hal-resource-editing.service.ts
index a4373ac8660..b89940c3f4e 100644
--- a/frontend/src/app/shared/components/fields/edit/services/hal-resource-editing.service.ts
+++ b/frontend/src/app/shared/components/fields/edit/services/hal-resource-editing.service.ts
@@ -30,7 +30,7 @@ import {
   combine, deriveRaw, InputState, multiInput, State, StatesGroup,
 } from '@openproject/reactivestates';
 import { filter, map } from 'rxjs/operators';
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import { Subject } from 'rxjs';
 import { FormResource } from 'core-app/features/hal/resources/form-resource';
 import { ChangeMap } from 'core-app/shared/components/fields/changeset/changeset';
@@ -92,12 +92,14 @@ export type ResourceChangesetClass = new(...args:any[]) => ResourceChangeset;
 
 @Injectable()
 export class HalResourceEditingService extends StateCacheService<ResourceChangeset> {
+  protected readonly injector = inject(Injector);
+  protected readonly halEvents = inject(HalEventsService);
+  protected readonly hook = inject(HookService);
+
   /** Committed / saved changes to work packages observable */
   public committedChanges = new Subject<ResourceChangesetCommit>();
 
-  constructor(protected readonly injector:Injector,
-    protected readonly halEvents:HalEventsService,
-    protected readonly hook:HookService) {
+  constructor() {
     super(new ChangesetStates().changesets);
   }
 
diff --git a/frontend/src/app/shared/components/fields/macros/attribute-label-macro.component.ts b/frontend/src/app/shared/components/fields/macros/attribute-label-macro.component.ts
index 94ec525e162..b39683a6a06 100644
--- a/frontend/src/app/shared/components/fields/macros/attribute-label-macro.component.ts
+++ b/frontend/src/app/shared/components/fields/macros/attribute-label-macro.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Injector,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Injector, OnInit, inject } from '@angular/core';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
 import {
@@ -60,6 +52,14 @@ import { IOPFieldSchema } from 'core-app/features/hal/interfaces';
   standalone: false,
 })
 export class AttributeLabelMacroComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  readonly injector = inject(Injector);
+  readonly resourceLoader = inject(AttributeModelLoaderService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly displayField = inject(DisplayFieldService);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   // Whether the value could not be loaded
   error:string|null = null;
 
@@ -83,17 +83,6 @@ export class AttributeLabelMacroComponent implements OnInit {
   // The label to render
   label:string|undefined;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly injector:Injector,
-    readonly resourceLoader:AttributeModelLoaderService,
-    readonly schemaCache:SchemaCacheService,
-    readonly displayField:DisplayFieldService,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-  }
-
   ngOnInit():void {
     const element = this.elementRef.nativeElement as HTMLElement;
     const model = element.dataset.model as SupportedAttributeModels;
diff --git a/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts b/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts
index 4dc1e940a19..6defe967826 100644
--- a/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts
+++ b/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import {
   firstValueFrom,
@@ -51,6 +51,11 @@ export type SupportedAttributeModels = 'project'|'workPackage';
 
 @Injectable({ providedIn: 'root' })
 export class AttributeModelLoaderService {
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly transitions = inject(TransitionService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly I18n = inject(I18nService);
+
   text = {
     not_found: this.I18n.t('js.editor.macro.attribute_reference.not_found'),
   };
@@ -59,10 +64,9 @@ export class AttributeModelLoaderService {
   // we may need to expensively filter for them
   private cache$ = multiInput<HalResource>();
 
-  constructor(readonly apiV3Service:ApiV3Service,
-    readonly transitions:TransitionService,
-    readonly currentProject:CurrentProjectService,
-    readonly I18n:I18nService) {
+  constructor() {
+    const transitions = this.transitions;
+
     // Clear cached values whenever leaving the page
     transitions.onStart({}, () => {
       this.cache$.clear();
diff --git a/frontend/src/app/shared/components/fields/macros/attribute-value-macro.component.ts b/frontend/src/app/shared/components/fields/macros/attribute-value-macro.component.ts
index 10f95d80d7d..5da60be70b6 100644
--- a/frontend/src/app/shared/components/fields/macros/attribute-value-macro.component.ts
+++ b/frontend/src/app/shared/components/fields/macros/attribute-value-macro.component.ts
@@ -26,16 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Injector,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Injector, OnInit, ViewChild, inject } from '@angular/core';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
 import {
@@ -63,6 +54,14 @@ export const ATTRIBUTE_MACRO_CLASS = 'op-attribute-value-macro';
   standalone: false,
 })
 export class AttributeValueMacroComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  readonly injector = inject(Injector);
+  readonly resourceLoader = inject(AttributeModelLoaderService);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly displayField = inject(DisplayFieldService);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @ViewChild('displayContainer') private displayContainer:ElementRef<HTMLSpanElement>;
 
   // Whether the value could not be loaded
@@ -81,17 +80,6 @@ export class AttributeValueMacroComponent implements OnInit {
 
   fieldName:string;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly injector:Injector,
-    readonly resourceLoader:AttributeModelLoaderService,
-    readonly schemaCache:SchemaCacheService,
-    readonly displayField:DisplayFieldService,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-  }
-
   ngOnInit():void {
     const element = this.elementRef.nativeElement as HTMLElement;
     const model = element.dataset.model as SupportedAttributeModels;
diff --git a/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.component.ts b/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.component.ts
index e2d605349d8..20ce537537d 100644
--- a/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.component.ts
+++ b/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Injector, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Injector, OnInit, inject } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
@@ -59,6 +52,15 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class WorkPackageQuickinfoMacroComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  readonly injector = inject(Injector);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly schemaCache = inject(SchemaCacheService);
+  readonly displayField = inject(DisplayFieldService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   // Whether the value could not be loaded
   error:string|null = null;
 
@@ -78,17 +80,6 @@ export class WorkPackageQuickinfoMacroComponent implements OnInit {
 
   detailed = false;
 
-  constructor(readonly elementRef:ElementRef,
-    readonly injector:Injector,
-    readonly apiV3Service:ApiV3Service,
-    readonly schemaCache:SchemaCacheService,
-    readonly displayField:DisplayFieldService,
-    readonly pathHelper:PathHelperService,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-  }
-
   ngOnInit() {
     const element = this.elementRef.nativeElement as HTMLElement;
     const id:string = element.dataset.id!;
diff --git a/frontend/src/app/shared/components/fields/openproject-fields.module.ts b/frontend/src/app/shared/components/fields/openproject-fields.module.ts
index 7e4bf930ca2..ae86b9f1853 100644
--- a/frontend/src/app/shared/components/fields/openproject-fields.module.ts
+++ b/frontend/src/app/shared/components/fields/openproject-fields.module.ts
@@ -131,6 +131,4 @@ import { FormsModule } from '@angular/forms';
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class OpenprojectFieldsModule {
-  constructor(injector:Injector) {
-  }
 }
diff --git a/frontend/src/app/shared/components/grids/grid/area.service.ts b/frontend/src/app/shared/components/grids/grid/area.service.ts
index 0e62466b9cd..6ed8e5a87d0 100644
--- a/frontend/src/app/shared/components/grids/grid/area.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/area.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { GridWidgetArea } from 'core-app/shared/components/grids/areas/grid-widget-area';
 import { GridArea } from 'core-app/shared/components/grids/areas/grid-area';
 import { GridGap } from 'core-app/shared/components/grids/areas/grid-gap';
@@ -26,6 +26,10 @@ interface GridPatchPayload {
 
 @Injectable()
 export class GridAreaService {
+  private apiV3Service = inject(ApiV3Service);
+  private toastService = inject(ToastService);
+  private i18n = inject(I18nService);
+
   private resource:GridResource;
 
   public schema:SchemaResource;
@@ -50,13 +54,6 @@ export class GridAreaService {
 
   public helpMode = false;
 
-  constructor(
-    private apiV3Service:ApiV3Service,
-    private toastService:ToastService,
-    private i18n:I18nService,
-  ) {
-  }
-
   public set gridResource(value:GridResource) {
     this.resource = value;
     this.fetchSchema();
diff --git a/frontend/src/app/shared/components/grids/grid/drag-and-drop.service.ts b/frontend/src/app/shared/components/grids/grid/drag-and-drop.service.ts
index 7c130915d36..4007f181a98 100644
--- a/frontend/src/app/shared/components/grids/grid/drag-and-drop.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/drag-and-drop.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { GridWidgetArea } from 'core-app/shared/components/grids/areas/grid-widget-area';
 import { GridArea } from 'core-app/shared/components/grids/areas/grid-area';
 import { GridAreaService } from 'core-app/shared/components/grids/grid/area.service';
@@ -8,6 +8,9 @@ import { distinctUntilChanged, filter, throttleTime } from 'rxjs/operators';
 
 @Injectable()
 export class GridDragAndDropService implements OnDestroy {
+  readonly layout = inject(GridAreaService);
+  readonly move = inject(GridMoveService);
+
   public draggedArea:GridWidgetArea|null;
 
   public placeholderArea:GridWidgetArea|null;
@@ -16,8 +19,7 @@ export class GridDragAndDropService implements OnDestroy {
 
   private mousedOverAreaObserver:Subscription;
 
-  constructor(readonly layout:GridAreaService,
-    readonly move:GridMoveService) {
+  constructor() {
     // ngOnInit is not called on services
     this.setupMousedOverAreaSubscription();
   }
diff --git a/frontend/src/app/shared/components/grids/grid/grid.component.ts b/frontend/src/app/shared/components/grids/grid/grid.component.ts
index 868383dabc6..4c0c42c60dd 100644
--- a/frontend/src/app/shared/components/grids/grid/grid.component.ts
+++ b/frontend/src/app/shared/components/grids/grid/grid.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ComponentRef, HostListener, Input, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ComponentRef, HostListener, Input, OnDestroy, OnInit, inject } from '@angular/core';
 import { GridResource } from 'core-app/features/hal/resources/grid-resource';
 import { DomSanitizer } from '@angular/platform-browser';
 import { GridWidgetsService } from 'core-app/shared/components/grids/widgets/widgets.service';
@@ -41,6 +41,16 @@ export const GRID_PROVIDERS = [
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class GridComponent implements OnDestroy, OnInit {
+  private sanitization = inject(DomSanitizer);
+  private widgetsService = inject(GridWidgetsService);
+  drag = inject(GridDragAndDropService);
+  resize = inject(GridResizeService);
+  layout = inject(GridAreaService);
+  add = inject(GridAddWidgetService);
+  remove = inject(GridRemoveWidgetService);
+  readonly browserDetector = inject(BrowserDetector);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   public uiWidgets:ComponentRef<any>[] = [];
 
   public GRID_AREA_HEIGHT = 'auto';
@@ -51,18 +61,6 @@ export class GridComponent implements OnDestroy, OnInit {
 
   @Input() grid:GridResource;
 
-  constructor(private sanitization:DomSanitizer,
-    private widgetsService:GridWidgetsService,
-    public drag:GridDragAndDropService,
-    public resize:GridResizeService,
-    public layout:GridAreaService,
-    public add:GridAddWidgetService,
-    public remove:GridRemoveWidgetService,
-    readonly browserDetector:BrowserDetector,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-  }
-
   ngOnInit() {
     this.layout.gridResource = this.grid;
   }
diff --git a/frontend/src/app/shared/components/grids/grid/initialization.service.ts b/frontend/src/app/shared/components/grids/grid/initialization.service.ts
index 2216f721124..9ee7a880cc7 100644
--- a/frontend/src/app/shared/components/grids/grid/initialization.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/initialization.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { GridResource } from 'core-app/features/hal/resources/grid-resource';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -10,10 +10,9 @@ import {
 
 @Injectable()
 export class GridInitializationService {
-  constructor(
-    readonly apiV3Service:ApiV3Service,
-    readonly halResourceService:HalResourceService) {
-  }
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly halResourceService = inject(HalResourceService);
+
 
   // If a page with the current page exists (scoped to the current user by the backend)
   // that page will be used to initialized the grid.
diff --git a/frontend/src/app/shared/components/grids/grid/move.service.ts b/frontend/src/app/shared/components/grids/grid/move.service.ts
index b61af3aa8d6..f78d7e486ed 100644
--- a/frontend/src/app/shared/components/grids/grid/move.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/move.service.ts
@@ -1,10 +1,11 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { GridWidgetArea } from 'core-app/shared/components/grids/areas/grid-widget-area';
 import { GridAreaService } from 'core-app/shared/components/grids/grid/area.service';
 
 @Injectable()
 export class GridMoveService {
-  constructor(private layout:GridAreaService) {}
+  private layout = inject(GridAreaService);
+
 
   public down(movedArea:GridWidgetArea|null, ignoreArea:GridWidgetArea) {
     const movedAreas:GridWidgetArea[] = [];
diff --git a/frontend/src/app/shared/components/grids/grid/resize.service.ts b/frontend/src/app/shared/components/grids/grid/resize.service.ts
index 621a7596a56..38a6f7552ee 100644
--- a/frontend/src/app/shared/components/grids/grid/resize.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/resize.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { GridWidgetArea } from 'core-app/shared/components/grids/areas/grid-widget-area';
 import { GridArea } from 'core-app/shared/components/grids/areas/grid-area';
 import { GridAreaService } from 'core-app/shared/components/grids/grid/area.service';
@@ -8,14 +8,14 @@ import { GridDragAndDropService } from 'core-app/shared/components/grids/grid/dr
 
 @Injectable()
 export class GridResizeService {
+  readonly layout = inject(GridAreaService);
+  readonly move = inject(GridMoveService);
+  readonly drag = inject(GridDragAndDropService);
+
   private resizedArea:GridWidgetArea|null;
 
   private targetIds:string[];
 
-  constructor(readonly layout:GridAreaService,
-    readonly move:GridMoveService,
-    readonly drag:GridDragAndDropService) { }
-
   public end(area:GridWidgetArea):Promise<GridResource>|undefined {
     if (!this.resizedArea) {
       return undefined;
diff --git a/frontend/src/app/shared/components/grids/widgets/abstract-widget.component.ts b/frontend/src/app/shared/components/grids/widgets/abstract-widget.component.ts
index 180c7654449..d875ec77f36 100644
--- a/frontend/src/app/shared/components/grids/widgets/abstract-widget.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/abstract-widget.component.ts
@@ -49,9 +49,6 @@ export abstract class AbstractWidgetComponent extends UntilDestroyedMixin {
     return true;
   }
 
-  /** Inserted by Angular inject() migration for backwards compatibility */
-  constructor(...args:unknown[]);
-
   constructor() {
     super();
   }
diff --git a/frontend/src/app/shared/components/grids/widgets/add/add.modal.ts b/frontend/src/app/shared/components/grids/widgets/add/add.modal.ts
index dd6a474db12..80fdde916d7 100644
--- a/frontend/src/app/shared/components/grids/widgets/add/add.modal.ts
+++ b/frontend/src/app/shared/components/grids/widgets/add/add.modal.ts
@@ -1,9 +1,5 @@
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { WidgetRegistration } from 'core-app/shared/components/grids/grid/grid.component';
 import { SchemaResource } from 'core-app/features/hal/resources/schema-resource';
 import { GridWidgetResource } from 'core-app/features/hal/resources/grid-widget-resource';
@@ -21,6 +17,11 @@ import { filter, take } from 'rxjs/operators';
   standalone: false,
 })
 export class AddGridWidgetModalComponent extends OpModalComponent implements OnInit {
+  readonly widgetsService = inject(GridWidgetsService);
+  readonly i18n = inject(I18nService);
+  readonly bannerService = inject(BannersService);
+  readonly loadingIndicator = inject(LoadingIndicatorService);
+
   text = {
     title: this.i18n.t('js.grid.add_widget'),
     close_popup: this.i18n.t('js.button_close'),
@@ -33,18 +34,6 @@ export class AddGridWidgetModalComponent extends OpModalComponent implements OnI
 
   private schema:SchemaResource;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) readonly locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly widgetsService:GridWidgetsService,
-    readonly i18n:I18nService,
-    readonly bannerService:BannersService,
-    readonly loadingIndicator:LoadingIndicatorService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit() {
     super.ngOnInit();
     this.fetchSchema();
diff --git a/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text-edit-field.service.ts b/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text-edit-field.service.ts
index 7b852cc5c27..c712d3d093d 100644
--- a/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text-edit-field.service.ts
+++ b/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text-edit-field.service.ts
@@ -1,5 +1,5 @@
 import { EditFieldHandler } from 'core-app/shared/components/fields/edit/editing-portal/edit-field-handler';
-import { ElementRef, Injectable, Injector } from '@angular/core';
+import { ElementRef, Injectable, Injector, inject } from '@angular/core';
 import { IFieldSchema } from 'core-app/shared/components/fields/field.base';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { GridWidgetResource } from 'core-app/features/hal/resources/grid-widget-resource';
@@ -13,6 +13,11 @@ import { HalSource } from 'core-app/features/hal/interfaces';
 
 @Injectable()
 export class CustomTextEditFieldService extends EditFieldHandler {
+  protected elementRef = inject(ElementRef);
+  protected injector = inject(Injector);
+  protected halResource = inject(HalResourceService);
+  protected schemaCache = inject(SchemaCacheService);
+
   public fieldName = 'text';
 
   public valueChanged$:BehaviorSubject<string>;
@@ -23,15 +28,6 @@ export class CustomTextEditFieldService extends EditFieldHandler {
 
   public active:boolean;
 
-  constructor(
-    protected elementRef:ElementRef,
-    protected injector:Injector,
-    protected halResource:HalResourceService,
-    protected schemaCache:SchemaCacheService,
-  ) {
-    super();
-  }
-
   public initialize(value:GridWidgetResource) {
     this.initializeChangeset(value);
     this.valueChanged$ = new BehaviorSubject(value.options.text as string);
diff --git a/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text.component.ts b/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text.component.ts
index a1e0608f778..249048a2755 100644
--- a/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/custom-text/custom-text.component.ts
@@ -1,21 +1,8 @@
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
-import {
-  ApplicationRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Injector,
-  OnChanges,
-  OnDestroy,
-  OnInit,
-  SimpleChanges,
-  ViewChild,
-} from '@angular/core';
+import { ApplicationRef, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild, inject } from '@angular/core';
 import {
   CustomTextEditFieldService,
 } from 'core-app/shared/components/grids/widgets/custom-text/custom-text-edit-field.service';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { filter } from 'rxjs/operators';
 import { GridAreaService } from 'core-app/shared/components/grids/grid/area.service';
@@ -30,29 +17,23 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
   standalone: false,
 })
 export class WidgetCustomTextComponent extends AbstractWidgetComponent implements OnInit, OnChanges, OnDestroy {
+  handler = inject(CustomTextEditFieldService);
+  protected cdr = inject(ChangeDetectorRef);
+  protected sanitization = inject(DomSanitizer);
+  protected appRef = inject(ApplicationRef);
+  protected layout = inject(GridAreaService);
+
   protected currentRawText:string;
 
   public customText:SafeHtml;
 
-  public text = {
-    attachments: this.I18n.t('js.label_attachments'),
-  };
+  public text!:{ attachments:string };
 
   @ViewChild('displayContainer') readonly displayContainer:ElementRef<HTMLElement>;
 
-  constructor(
-    protected I18n:I18nService,
-    protected injector:Injector,
-    public handler:CustomTextEditFieldService,
-    protected cdr:ChangeDetectorRef,
-    protected sanitization:DomSanitizer,
-    protected appRef:ApplicationRef,
-    protected layout:GridAreaService,
-  ) {
-    super(I18n, injector);
-  }
-
   ngOnInit():void {
+    this.text = { attachments: this.i18n.t('js.label_attachments') };
+
     this.setupVariables(true);
 
     this
@@ -96,7 +77,7 @@ export class WidgetCustomTextComponent extends AbstractWidgetComponent implement
   }
 
   public get placeholderText() {
-    return this.I18n.t('js.grid.widgets.work_packages_overview.placeholder');
+    return this.i18n.t('js.grid.widgets.work_packages_overview.placeholder');
   }
 
   public get inplaceEditClasses() {
diff --git a/frontend/src/app/shared/components/grids/widgets/documents/documents.component.ts b/frontend/src/app/shared/components/grids/widgets/documents/documents.component.ts
index 36c4fde4501..7b3f57ffef4 100644
--- a/frontend/src/app/shared/components/grids/widgets/documents/documents.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/documents/documents.component.ts
@@ -1,13 +1,5 @@
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Injector,
-  OnInit,
-  SecurityContext,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, SecurityContext, inject } from '@angular/core';
 import { CollectionResource } from 'core-app/features/hal/resources/collection-resource';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -24,6 +16,14 @@ import { DocumentResource } from '../../../../../../../../modules/documents/fron
   standalone: false,
 })
 export class WidgetDocumentsComponent extends AbstractWidgetComponent implements OnInit {
+  readonly halResource = inject(HalResourceService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly timezone = inject(TimezoneService);
+  readonly domSanitizer = inject(DomSanitizer);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly cdr = inject(ChangeDetectorRef);
+
   public text = {
     noResults: this.i18n.t('js.grid.widgets.documents.no_results'),
     project: this.i18n.t('js.label_project'),
@@ -33,18 +33,6 @@ export class WidgetDocumentsComponent extends AbstractWidgetComponent implements
 
   private entriesLoaded = false;
 
-  constructor(readonly halResource:HalResourceService,
-    readonly pathHelper:PathHelperService,
-    readonly apiV3Service:ApiV3Service,
-    readonly i18n:I18nService,
-    readonly timezone:TimezoneService,
-    readonly domSanitizer:DomSanitizer,
-    protected readonly injector:Injector,
-    readonly currentProject:CurrentProjectService,
-    readonly cdr:ChangeDetectorRef) {
-    super(i18n, injector);
-  }
-
   ngOnInit() {
     this.halResource
       .get<CollectionResource>(this.documentsUrl)
diff --git a/frontend/src/app/shared/components/grids/widgets/header/header.component.ts b/frontend/src/app/shared/components/grids/widgets/header/header.component.ts
index 7e8f18ef9e1..0da7faea7f2 100644
--- a/frontend/src/app/shared/components/grids/widgets/header/header.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/header/header.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, Component, EventEmitter, Input, Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { GridAreaService } from 'core-app/shared/components/grids/grid/area.service';
 import { GridDragAndDropService } from 'core-app/shared/components/grids/grid/drag-and-drop.service';
 
@@ -40,19 +38,15 @@ import { GridDragAndDropService } from 'core-app/shared/components/grids/grid/dr
   standalone: false,
 })
 export class WidgetHeaderComponent {
+  readonly layout = inject(GridAreaService);
+  readonly drag = inject(GridDragAndDropService);
+
   @Input() name:string;
 
   @Input() editable = true;
 
   @Output() onRenamed = new EventEmitter<string>();
 
-  constructor(
-    readonly layout:GridAreaService,
-    readonly drag:GridDragAndDropService,
-  ) {
-
-  }
-
   public renamed(name:string) {
     this.onRenamed.emit(name);
   }
diff --git a/frontend/src/app/shared/components/grids/widgets/members/members.component.ts b/frontend/src/app/shared/components/grids/widgets/members/members.component.ts
index 3e7b2b125ad..5efbe13ec14 100644
--- a/frontend/src/app/shared/components/grids/widgets/members/members.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/members/members.component.ts
@@ -1,10 +1,5 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Injector,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { AbstractTurboWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-turbo-widget.component';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
 
@@ -15,19 +10,14 @@ import { CurrentUserService } from 'core-app/core/current-user/current-user.serv
   standalone: false
 })
 export class WidgetMembersComponent extends AbstractTurboWidgetComponent {
-  text = {
-    missing_permission: this.I18n.t('js.grid.widgets.missing_permission'),
-  };
+  protected readonly currentProject = inject(CurrentProjectService);
+  protected readonly currentUser = inject(CurrentUserService);
+
+  get text() {
+    return { missing_permission: this.i18n.t('js.grid.widgets.missing_permission') };
+  }
 
   hasCapability$ = this.currentUser.hasCapabilities$('memberships/read', this.currentProject.id);
-  constructor(
-    protected readonly I18n:I18nService,
-    protected readonly injector:Injector,
-    protected readonly currentProject:CurrentProjectService,
-    protected readonly currentUser:CurrentUserService,
-  ) {
-    super(I18n, injector);
-  }
 
   public get projectIdentifier() {
     return this.currentProject.identifier;
diff --git a/frontend/src/app/shared/components/grids/widgets/menu/widget-abstract-menu.component.ts b/frontend/src/app/shared/components/grids/widgets/menu/widget-abstract-menu.component.ts
index d0c2ce5a6a3..5a6173aa575 100644
--- a/frontend/src/app/shared/components/grids/widgets/menu/widget-abstract-menu.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/menu/widget-abstract-menu.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Directive, Injector, Input } from '@angular/core';
+import { Directive, Injector, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
 import { GridWidgetResource } from 'core-app/features/hal/resources/grid-widget-resource';
@@ -35,13 +35,12 @@ import { GridAreaService } from 'core-app/shared/components/grids/grid/area.serv
 
 @Directive()
 export abstract class WidgetAbstractMenuComponent {
-  @Input() resource:GridWidgetResource;
+  readonly injector = inject(Injector);
+  readonly i18n = inject(I18nService);
+  protected readonly remove = inject(GridRemoveWidgetService);
+  protected readonly layout = inject(GridAreaService);
 
-  constructor(readonly injector:Injector,
-    readonly i18n:I18nService,
-    protected readonly remove:GridRemoveWidgetService,
-    protected readonly layout:GridAreaService) {
-  }
+  @Input() resource:GridWidgetResource;
 
   public get menuItemsFactory():() => Promise<OpContextMenuItem[]> {
     return this.buildItems.bind(this);
diff --git a/frontend/src/app/shared/components/grids/widgets/project-favorites/widget-project-favorites.component.ts b/frontend/src/app/shared/components/grids/widgets/project-favorites/widget-project-favorites.component.ts
index c506840db02..d70a58c2194 100644
--- a/frontend/src/app/shared/components/grids/widgets/project-favorites/widget-project-favorites.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/project-favorites/widget-project-favorites.component.ts
@@ -1,14 +1,5 @@
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  HostBinding,
-  Injector,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -26,6 +17,13 @@ import { Observable } from 'rxjs';
   standalone: false,
 })
 export class WidgetProjectFavoritesComponent extends AbstractWidgetComponent implements OnInit {
+  readonly halResource = inject(HalResourceService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly timezone = inject(TimezoneService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly cdr = inject(ChangeDetectorRef);
+
   @HostBinding('class.op-widget-project-favorites') className = true;
 
   public text = {
@@ -35,19 +33,6 @@ export class WidgetProjectFavoritesComponent extends AbstractWidgetComponent imp
 
   public projects$:Observable<ProjectResource[]>;
 
-  constructor(
-    readonly halResource:HalResourceService,
-    readonly pathHelper:PathHelperService,
-    readonly i18n:I18nService,
-    protected readonly injector:Injector,
-    readonly timezone:TimezoneService,
-    readonly apiV3Service:ApiV3Service,
-    readonly currentProject:CurrentProjectService,
-    readonly cdr:ChangeDetectorRef,
-  ) {
-    super(i18n, injector);
-  }
-
   ngOnInit() {
     const filters = new ApiV3FilterBuilder();
     filters.add('favorited', '=', true);
diff --git a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.ts b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.ts
index f86c0ab9b6e..746bbaec6d4 100644
--- a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.ts
+++ b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.ts
@@ -1,9 +1,5 @@
-import {
-  ApplicationRef, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, Injector, OnInit,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ApplicationRef, ChangeDetectionStrategy, Component, Injector, OnInit, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { LoadingIndicatorService } from 'core-app/core/loading-indicator/loading-indicator.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -20,6 +16,14 @@ import { TimeEntriesCurrentUserConfigurationModalService } from 'core-app/shared
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class TimeEntriesCurrentUserConfigurationModalComponent extends OpModalComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly appRef = inject(ApplicationRef);
+  readonly loadingIndicator = inject(LoadingIndicatorService);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly configuration = inject(ConfigurationService);
+  readonly timeEntriesCurrentUserConfigurationModalService = inject(TimeEntriesCurrentUserConfigurationModalService);
+
   public text = {
     displayedDays: this.I18n.t('js.grid.widgets.time_entries_current_user.displayed_days'),
     closePopup: this.I18n.t('js.close_popup_title'),
@@ -36,19 +40,6 @@ export class TimeEntriesCurrentUserConfigurationModalComponent extends OpModalCo
 
   public days:IDayData[];
 
-  constructor(@Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService,
-    readonly injector:Injector,
-    readonly appRef:ApplicationRef,
-    readonly loadingIndicator:LoadingIndicatorService,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly configuration:ConfigurationService,
-    readonly elementRef:ElementRef,
-    readonly timeEntriesCurrentUserConfigurationModalService:TimeEntriesCurrentUserConfigurationModalService) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit() {
     const localDayOptions = this.locals.options.days;
     this.daysOriginalCheckedValues = localDayOptions.length > 0 ? localDayOptions : Array.from({ length: 7 }, () => true);
diff --git a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/services/configuration-modal/configuration-modal.service.ts b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/services/configuration-modal/configuration-modal.service.ts
index 4d088aedcb4..af48b5add6a 100644
--- a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/services/configuration-modal/configuration-modal.service.ts
+++ b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/services/configuration-modal/configuration-modal.service.ts
@@ -41,20 +41,12 @@ export class TimeEntriesCurrentUserConfigurationModalService {
   }
 
   getOriginalIndex(offsetToApply:number, currentIndex:number, arrayLength:number):number {
-    let originalIndex = currentIndex + offsetToApply;
-
-    if (originalIndex < 0) {
-      originalIndex = arrayLength - 1;
-    } else if (originalIndex >= arrayLength) {
-      originalIndex = 0;
-    }
-
-    return originalIndex;
+    return ((currentIndex + offsetToApply) % arrayLength + arrayLength) % arrayLength;
   }
 
   getCheckedValuesInOriginalOrder(days:IDayData[]) {
     const configuredDays = days
-      .sort((a, b) => (a.originalIndex < b.originalIndex ? -1 : 1))
+      .sort((a, b) => a.originalIndex - b.originalIndex)
       .map((localeDayData) => localeDayData.checked);
 
     return this.validDays(configuredDays as DisplayedDays);
diff --git a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/time-entries-current-user.component.ts b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/time-entries-current-user.component.ts
index 0dd1265113a..c421a83125a 100644
--- a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/time-entries-current-user.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/time-entries-current-user.component.ts
@@ -1,9 +1,6 @@
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
 import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource';
 import { CollectionResource } from 'core-app/features/hal/resources/collection-resource';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
 import { DisplayedDays } from 'core-app/features/calendar/te-calendar/te-calendar.component';
@@ -16,18 +13,14 @@ import { TimezoneService } from 'core-app/core/datetime/timezone.service';
   standalone: false,
 })
 export class WidgetTimeEntriesCurrentUserComponent extends AbstractWidgetComponent implements OnInit {
+  readonly timezone = inject(TimezoneService);
+  readonly pathHelper = inject(PathHelperService);
+  protected readonly cdr = inject(ChangeDetectorRef);
+
   public entries:TimeEntryResource[] = [];
 
   public displayedDays:DisplayedDays;
 
-  constructor(protected readonly injector:Injector,
-    readonly timezone:TimezoneService,
-    readonly i18n:I18nService,
-    readonly pathHelper:PathHelperService,
-    protected readonly cdr:ChangeDetectorRef) {
-    super(i18n, injector);
-  }
-
   public ngOnInit() {
     this.displayedDays = this.resource.options.days as DisplayedDays;
   }
diff --git a/frontend/src/app/shared/components/grids/widgets/time-entries/list/time-entries-list.component.ts b/frontend/src/app/shared/components/grids/widgets/time-entries/list/time-entries-list.component.ts
index c10f6b2e324..6e49b928188 100644
--- a/frontend/src/app/shared/components/grids/widgets/time-entries/list/time-entries-list.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/time-entries/list/time-entries-list.component.ts
@@ -1,11 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectorRef,
-  Directive,
-  Injector,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Directive, Injector, OnDestroy, OnInit, inject } from '@angular/core';
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -27,6 +20,13 @@ import { MeetingResource } from 'core-app/features/hal/resources/meeting-resourc
 
 @Directive()
 export abstract class WidgetTimeEntriesListComponent extends AbstractWidgetComponent implements OnInit, AfterViewInit, OnDestroy {
+  readonly injector = inject(Injector);
+  readonly timezone = inject(TimezoneService);
+  readonly i18n = inject(I18nService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly confirmDialog = inject(ConfirmDialogService);
+  protected readonly cdr = inject(ChangeDetectorRef);
+
   public text = {
     edit: this.i18n.t('js.button_edit'),
     delete: this.i18n.t('js.button_delete'),
@@ -51,17 +51,6 @@ export abstract class WidgetTimeEntriesListComponent extends AbstractWidgetCompo
   @InjectField() public readonly apiV3Service:ApiV3Service;
   @InjectField() public readonly turboRequests:TurboRequestsService;
 
-  constructor(
-    readonly injector:Injector,
-    readonly timezone:TimezoneService,
-    readonly i18n:I18nService,
-    readonly pathHelper:PathHelperService,
-    readonly confirmDialog:ConfirmDialogService,
-    protected readonly cdr:ChangeDetectorRef,
-  ) {
-    super(i18n, injector);
-  }
-
   ngOnInit():void {
     this.loadTimeEntries();
   }
diff --git a/frontend/src/app/shared/components/grids/widgets/time-entries/project/time-entries-project.component.ts b/frontend/src/app/shared/components/grids/widgets/time-entries/project/time-entries-project.component.ts
index bcd54ca1384..75cc35c04e1 100644
--- a/frontend/src/app/shared/components/grids/widgets/time-entries/project/time-entries-project.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/time-entries/project/time-entries-project.component.ts
@@ -1,17 +1,7 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  Injector,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { WidgetTimeEntriesListComponent } from 'core-app/shared/components/grids/widgets/time-entries/list/time-entries-list.component';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { FilterOperator } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder';
-import { TimezoneService } from 'core-app/core/datetime/timezone.service';
-import { ConfirmDialogService } from 'core-app/shared/components/modals/confirm-dialog/confirm-dialog.service';
 import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
 
 @Component({
@@ -26,15 +16,7 @@ import { HalResourceEditingService } from 'core-app/shared/components/fields/edi
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WidgetTimeEntriesProjectComponent extends WidgetTimeEntriesListComponent implements OnInit {
-  constructor(readonly injector:Injector,
-    readonly timezone:TimezoneService,
-    readonly i18n:I18nService,
-    readonly pathHelper:PathHelperService,
-    readonly confirmDialog:ConfirmDialogService,
-    protected readonly cdr:ChangeDetectorRef,
-    protected readonly currentProject:CurrentProjectService) {
-    super(injector, timezone, i18n, pathHelper, confirmDialog, cdr);
-  }
+  protected readonly currentProject = inject(CurrentProjectService);
 
   protected dmFilters():[string, FilterOperator, [string]][] {
     return [['spentOn', '>t-', ['7']] as [string, FilterOperator, [string]],
diff --git a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts
index 3b8585606fe..9db3668dd27 100644
--- a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts
@@ -26,9 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Injector } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
@@ -42,21 +41,15 @@ import { CurrentUserService } from 'core-app/core/current-user/current-user.serv
   standalone: false,
 })
 export class WidgetWpCalendarComponent extends AbstractWidgetComponent {
-  text = {
-    missing_permission: this.I18n.t('js.grid.widgets.missing_permission'),
-  };
+  protected readonly currentProject = inject(CurrentProjectService);
+  protected readonly currentUser = inject(CurrentUserService);
+
+  get text() {
+    return { missing_permission: this.i18n.t('js.grid.widgets.missing_permission') };
+  }
 
   hasCapability$ = this.currentUser.hasCapabilities$('work_packages/read', this.currentProject.id);
 
-  constructor(
-    protected readonly I18n:I18nService,
-    protected readonly injector:Injector,
-    protected readonly currentProject:CurrentProjectService,
-    protected readonly currentUser:CurrentUserService,
-  ) {
-    super(I18n, injector);
-  }
-
   public get projectIdentifier() {
     return this.currentProject.identifier;
   }
diff --git a/frontend/src/app/shared/components/grids/widgets/wp-graph/wp-graph.component.ts b/frontend/src/app/shared/components/grids/widgets/wp-graph/wp-graph.component.ts
index 2ff6bebd2e7..89a38520eb6 100644
--- a/frontend/src/app/shared/components/grids/widgets/wp-graph/wp-graph.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/wp-graph/wp-graph.component.ts
@@ -1,8 +1,5 @@
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, OnDestroy, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit, inject } from '@angular/core';
 import { WorkPackageEmbeddedGraphDataset } from 'core-app/shared/components/work-package-graphs/embedded/wp-embedded-graph.component';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { AbstractWidgetComponent } from 'core-app/shared/components/grids/widgets/abstract-widget.component';
 import { ChartOptions } from 'chart.js';
 import { WpGraphConfigurationService } from 'core-app/shared/components/work-package-graphs/configuration/wp-graph-configuration.service';
@@ -17,14 +14,10 @@ import { WpGraphConfiguration } from 'core-app/shared/components/work-package-gr
   standalone: false,
 })
 export class WidgetWpGraphComponent extends AbstractWidgetComponent implements OnInit, OnDestroy {
-  public datasets:WorkPackageEmbeddedGraphDataset[] = [];
+  protected cdr = inject(ChangeDetectorRef);
+  protected readonly graphConfiguration = inject(WpGraphConfigurationService);
 
-  constructor(protected i18n:I18nService,
-    protected injector:Injector,
-    protected cdr:ChangeDetectorRef,
-    protected readonly graphConfiguration:WpGraphConfigurationService) {
-    super(i18n, injector);
-  }
+  public datasets:WorkPackageEmbeddedGraphDataset[] = [];
 
   ngOnInit() {
     this.initializeConfiguration();
diff --git a/frontend/src/app/shared/components/header-project-select/header-project-select.component.ts b/frontend/src/app/shared/components/header-project-select/header-project-select.component.ts
index c01fc2de547..96eddcf953e 100644
--- a/frontend/src/app/shared/components/header-project-select/header-project-select.component.ts
+++ b/frontend/src/app/shared/components/header-project-select/header-project-select.component.ts
@@ -28,7 +28,7 @@
 
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { ChangeDetectionStrategy, Component, HostBinding, OnDestroy, OnInit, ViewEncapsulation, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, OnDestroy, OnInit, ViewEncapsulation, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { BehaviorSubject, Observable, ReplaySubject, Subscription } from 'rxjs';
 import { map, shareReplay, take, tap } from 'rxjs/operators';
@@ -56,6 +56,14 @@ import { ConfigurationService } from 'core-app/core/config/configuration.service
   standalone: false,
 })
 export class OpHeaderProjectSelectComponent extends UntilDestroyedMixin implements OnInit, OnDestroy, AfterViewInit {
+  readonly pathHelper = inject(PathHelperService);
+  readonly configuration = inject(ConfigurationService);
+  readonly I18n = inject(I18nService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly searchableProjectListService = inject(SearchableProjectListService);
+  readonly currentUserService = inject(CurrentUserService);
+  readonly apiV3Service = inject(ApiV3Service);
+
   @HostBinding('class.op-project-select') className = true;
 
   @ViewChild('projectSearchField', { read: ElementRef })
@@ -161,15 +169,7 @@ export class OpHeaderProjectSelectComponent extends UntilDestroyedMixin implemen
 
   private displayModeLocalStorageKey = 'openProject-project-select-display-mode';
 
-  constructor(
-    readonly pathHelper:PathHelperService,
-    readonly configuration:ConfigurationService,
-    readonly I18n:I18nService,
-    readonly currentProject:CurrentProjectService,
-    readonly searchableProjectListService:SearchableProjectListService,
-    readonly currentUserService:CurrentUserService,
-    readonly apiV3Service:ApiV3Service,
-  ) {
+  constructor() {
     super();
 
     if(this.currentProject.id) {
diff --git a/frontend/src/app/shared/components/header-project-select/list/header-project-select-list.component.ts b/frontend/src/app/shared/components/header-project-select/list/header-project-select-list.component.ts
index 8655655ef46..9d67f148811 100644
--- a/frontend/src/app/shared/components/header-project-select/list/header-project-select-list.component.ts
+++ b/frontend/src/app/shared/components/header-project-select/list/header-project-select-list.component.ts
@@ -1,17 +1,5 @@
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostBinding,
-  Input,
-  OnChanges,
-  OnInit,
-  Output,
-  SimpleChanges,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, Input, OnChanges, OnInit, Output, SimpleChanges, inject } from '@angular/core';
 import {
   SearchableProjectListService,
 } from 'core-app/shared/components/searchable-project-list/searchable-project-list.service';
@@ -29,6 +17,14 @@ import { getMetaContent } from 'core-app/core/setup/globals/global-helpers';
   standalone: false,
 })
 export class OpHeaderProjectSelectListComponent implements OnInit, OnChanges {
+  readonly I18n = inject(I18nService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly configuration = inject(ConfigurationService);
+  readonly searchableProjectListService = inject(SearchableProjectListService);
+  readonly elementRef = inject(ElementRef);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly currentProjectService = inject(CurrentProjectService);
+
   @HostBinding('class.spot-list') classNameList = true;
 
   @HostBinding('class.op-header-project-select-list') className = true;
@@ -64,16 +60,6 @@ export class OpHeaderProjectSelectListComponent implements OnInit, OnChanges {
 
   public portfolioModelsEnabled = this.configuration.activeFeatureFlags.includes('portfolioModels');
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly pathHelper:PathHelperService,
-    readonly configuration:ConfigurationService,
-    readonly searchableProjectListService:SearchableProjectListService,
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-    readonly currentProjectService:CurrentProjectService,
-  ) { }
-
   ngOnInit():void {
     if (this.root) {
       this.searchableProjectListService.selectedItemID$.subscribe((selectedItemID) => {
diff --git a/frontend/src/app/shared/components/modal/modal-overlay.component.ts b/frontend/src/app/shared/components/modal/modal-overlay.component.ts
index 1d8dd4d0c16..64bcd65198e 100644
--- a/frontend/src/app/shared/components/modal/modal-overlay.component.ts
+++ b/frontend/src/app/shared/components/modal/modal-overlay.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ComponentRef,
-  ElementRef,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ComponentRef, ElementRef, ViewChild, inject } from '@angular/core';
 import { CdkPortalOutlet, ComponentPortal } from '@angular/cdk/portal';
 import { combineLatest } from 'rxjs';
 import { distinctUntilChanged, filter } from 'rxjs/operators';
@@ -52,6 +45,10 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
   standalone: false,
 })
 export class OpModalOverlayComponent extends UntilDestroyedMixin {
+  readonly modalService = inject(OpModalService);
+  readonly I18n = inject(I18nService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   public notFullscreen = false;
 
   mobileTopPosition = false;
@@ -73,14 +70,6 @@ export class OpModalOverlayComponent extends UntilDestroyedMixin {
 
   activeModalInstance$ = this.modalService.activeModalInstance$;
 
-  constructor(
-    readonly modalService:OpModalService,
-    readonly I18n:I18nService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
-
   setupListener():void {
     combineLatest([
       this.activeModalInstance$,
diff --git a/frontend/src/app/shared/components/modal/modal-wrapper-augment.service.ts b/frontend/src/app/shared/components/modal/modal-wrapper-augment.service.ts
index 325fb65bc77..82dc9ff0cd1 100644
--- a/frontend/src/app/shared/components/modal/modal-wrapper-augment.service.ts
+++ b/frontend/src/app/shared/components/modal/modal-wrapper-augment.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Inject, Injectable, Injector, DOCUMENT } from '@angular/core';
+import { Injectable, Injector, DOCUMENT, inject } from '@angular/core';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { DynamicContentModalComponent } from 'core-app/shared/components/modals/modal-wrapper/dynamic-content.modal';
 
@@ -36,11 +36,14 @@ import { DynamicContentModalComponent } from 'core-app/shared/components/modals/
  */
 @Injectable({ providedIn: 'root' })
 export class OpModalWrapperAugmentService {
-  constructor(
-    @Inject(DOCUMENT) protected documentElement:Document,
-    protected injector:Injector,
-    protected opModalService:OpModalService,
-  ) {
+  protected documentElement = inject<Document>(DOCUMENT);
+  protected injector = inject(Injector);
+  protected opModalService = inject(OpModalService);
+
+  constructor() {
+    const documentElement = this.documentElement;
+    const opModalService = this.opModalService;
+
     documentElement.addEventListener('turbo:before-render', () => opModalService.close());
   }
 
diff --git a/frontend/src/app/shared/components/modal/modal.component.ts b/frontend/src/app/shared/components/modal/modal.component.ts
index 09ea32300b0..96b23c47aca 100644
--- a/frontend/src/app/shared/components/modal/modal.component.ts
+++ b/frontend/src/app/shared/components/modal/modal.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectorRef, Directive, ElementRef, EventEmitter, Inject, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Directive, ElementRef, EventEmitter, OnDestroy, OnInit, inject } from '@angular/core';
 
 import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -35,6 +35,10 @@ import { debounce } from 'lodash';
 
 @Directive()
 export abstract class OpModalComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  locals = inject<OpModalLocalsMap>(OpModalLocalsToken);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly elementRef = inject(ElementRef);
+
   /* Reference to service */
   protected service:OpModalService = this.locals.service;
 
@@ -51,14 +55,6 @@ export abstract class OpModalComponent extends UntilDestroyedMixin implements On
   /* Data to be return from this modal instance */
   public data:unknown;
 
-  protected constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     this.element = this.elementRef.nativeElement as HTMLElement;
   }
diff --git a/frontend/src/app/shared/components/modal/modal.service.ts b/frontend/src/app/shared/components/modal/modal.service.ts
index 20cd2d8e480..d28c569d2e7 100644
--- a/frontend/src/app/shared/components/modal/modal.service.ts
+++ b/frontend/src/app/shared/components/modal/modal.service.ts
@@ -27,11 +27,7 @@
 //++
 
 import { ComponentType } from '@angular/cdk/portal';
-import {
-  Injectable,
-  InjectionToken,
-  Injector,
-} from '@angular/core';
+import { Injectable, InjectionToken, Injector, inject } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, take } from 'rxjs/operators';
 
@@ -50,13 +46,13 @@ export interface ModalData {
 
 @Injectable({ providedIn: 'root' })
 export class OpModalService {
+  private readonly injector = inject(Injector);
+
   public activeModalInstance$ = new BehaviorSubject<OpModalComponent|null>(null);
 
   public activeModalData$ = new BehaviorSubject<ModalData|null>(null);
 
-  constructor(
-    private readonly injector:Injector,
-  ) {
+  constructor() {
     // Listen to keystrokes on window to close context menus
     window.addEventListener('keydown', (evt:KeyboardEvent) => {
       if (evt.key !== 'Escape' || evt.defaultPrevented) {
diff --git a/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.ts b/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.ts
index 755b7bb67ed..23f59d5c132 100644
--- a/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.ts
+++ b/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.ts
@@ -26,17 +26,9 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 export interface ConfirmDialogOptions {
@@ -69,6 +61,8 @@ export interface ConfirmDialogOptions {
   standalone: false,
 })
 export class ConfirmDialogModalComponent extends OpModalComponent {
+  readonly I18n = inject(I18nService);
+
   public showClose:boolean;
 
   public showListData:boolean;
@@ -101,14 +95,10 @@ export class ConfirmDialogModalComponent extends OpModalComponent {
 
   public dangerHighlighting:boolean;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-  ) {
-    super(locals, cdRef, elementRef);
-    this.options = (locals.options || {}) as ConfirmDialogOptions;
+  constructor() {
+    super();
+
+    this.options = (this.locals.options ?? {}) as ConfirmDialogOptions;
 
     this.dangerHighlighting = _.defaultTo(this.options.dangerHighlighting, false);
     this.showListData = _.defaultTo(this.options.showListData, false);
diff --git a/frontend/src/app/shared/components/modals/editor/editor-macros.service.ts b/frontend/src/app/shared/components/modals/editor/editor-macros.service.ts
index 2e146315ada..9890ca6f436 100644
--- a/frontend/src/app/shared/components/modals/editor/editor-macros.service.ts
+++ b/frontend/src/app/shared/components/modals/editor/editor-macros.service.ts
@@ -27,7 +27,7 @@
 //++
 
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, inject } from '@angular/core';
 import {
   WpButtonMacroModalComponent,
 } from 'core-app/shared/components/modals/editor/macro-wp-button-modal/wp-button-macro.modal';
@@ -44,11 +44,9 @@ import { PortalOutletTarget } from 'core-app/shared/components/modal/portal-outl
 
 @Injectable()
 export class EditorMacrosService {
-  constructor(
-    readonly opModalService:OpModalService,
-    readonly injector:Injector,
-  ) {
-  }
+  readonly opModalService = inject(OpModalService);
+  readonly injector = inject(Injector);
+
 
   /**
    * Show a modal to edit the work package button macro settings.
diff --git a/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.ts b/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.ts
index 145ae4b9cdf..d4df749bca6 100644
--- a/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.ts
+++ b/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.ts
@@ -26,12 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 @Component({
@@ -43,6 +39,8 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class ChildPagesMacroModalComponent extends OpModalComponent implements AfterViewInit {
+  readonly I18n = inject(I18nService);
+
   public changed = false;
 
   public showClose = true;
@@ -67,11 +65,9 @@ export class ChildPagesMacroModalComponent extends OpModalComponent implements A
     close_popup: this.I18n.t('js.close_popup_title'),
   };
 
-  constructor(readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService) {
-    super(locals, cdRef, elementRef);
+  constructor() {
+    super();
+
     this.selectedPage = this.page = this.locals.page;
     this.selectedIncludeParent = this.includeParent = this.locals.includeParent;
 
diff --git a/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.ts b/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.ts
index 96dc1f9f07c..fa6d358152d 100644
--- a/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.ts
+++ b/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.ts
@@ -27,11 +27,9 @@
 //++
 
 import {
-  AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, ViewChild, inject,
+  AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, ViewChild, inject,
 } from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CodeMirrorLoaderService } from 'core-app/shared/components/editor/components/ckeditor/codemirror-loader.service';
 import type { Editor as CodeMirrorEditor } from 'codemirror';
@@ -66,9 +64,6 @@ export class CodeBlockMacroModalComponent extends OpModalComponent implements Af
 
   @ViewChild('codeMirrorPane', { static: true }) codeMirrorPane:ElementRef;
 
-  readonly elementRef = inject(ElementRef);
-  public locals = inject(OpModalLocalsToken) as OpModalLocalsMap;
-  readonly cdRef = inject(ChangeDetectorRef);
   readonly I18n = inject(I18nService);
   readonly codeMirrorLoader = inject(CodeMirrorLoaderService);
 
@@ -82,11 +77,7 @@ export class CodeBlockMacroModalComponent extends OpModalComponent implements Af
   };
 
   constructor() {
-    super(
-      inject(OpModalLocalsToken) as OpModalLocalsMap,
-      inject(ChangeDetectorRef),
-      inject(ElementRef),
-    );
+    super();
     this.languageClass = (this.locals.languageClass as string | undefined) ?? 'language-text';
     this.content = this.locals.content as string;
 
diff --git a/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.ts b/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.ts
index ebc108054ec..61a4fc4a55d 100644
--- a/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.ts
+++ b/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.ts
@@ -26,12 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 @Component({
@@ -43,6 +39,8 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WikiIncludePageMacroModalComponent extends OpModalComponent implements AfterViewInit {
+  readonly I18n = inject(I18nService);
+
   public changed = false;
 
   public showClose = true;
@@ -62,11 +60,9 @@ export class WikiIncludePageMacroModalComponent extends OpModalComponent impleme
     close_popup: this.I18n.t('js.close_popup_title'),
   };
 
-  constructor(readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService) {
-    super(locals, cdRef, elementRef);
+  constructor() {
+    super();
+
     this.selectedPage = this.page = this.locals.page;
 
     // We could provide an autocompleter here to get correct page names
diff --git a/frontend/src/app/shared/components/modals/editor/macro-wp-button-modal/wp-button-macro.modal.ts b/frontend/src/app/shared/components/modals/editor/macro-wp-button-modal/wp-button-macro.modal.ts
index 38f4de54614..e63f3300aa0 100644
--- a/frontend/src/app/shared/components/modals/editor/macro-wp-button-modal/wp-button-macro.modal.ts
+++ b/frontend/src/app/shared/components/modals/editor/macro-wp-button-modal/wp-button-macro.modal.ts
@@ -26,18 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  ViewChild,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TypeResource } from 'core-app/features/hal/resources/type-resource';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -50,6 +40,10 @@ import { FormResource } from 'core-app/features/hal/resources/form-resource';
   standalone: false,
 })
 export class WpButtonMacroModalComponent extends OpModalComponent implements AfterViewInit {
+  protected currentProject = inject(CurrentProjectService);
+  protected apiV3Service = inject(ApiV3Service);
+  readonly I18n = inject(I18nService);
+
   public changed = false;
 
   public showClose = true;
@@ -77,13 +71,9 @@ export class WpButtonMacroModalComponent extends OpModalComponent implements Aft
     close_popup: this.I18n.t('js.close_popup_title'),
   };
 
-  constructor(readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    protected currentProject:CurrentProjectService,
-    protected apiV3Service:ApiV3Service,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService) {
-    super(locals, cdRef, elementRef);
+  constructor() {
+    super();
+
     this.selectedType = this.type = this.locals.type;
     this.classes = this.locals.classes;
     this.buttonStyle = this.classes === 'button';
diff --git a/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.ts b/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.ts
index e7e57a8eb65..74bc9864f1b 100644
--- a/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.ts
+++ b/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.ts
@@ -31,10 +31,8 @@ import { States } from 'core-app/core/states/states.service';
 import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, inject,
+  ChangeDetectionStrategy, Component, OnInit, inject,
 } from '@angular/core';
 import {
   UntypedFormGroup,
@@ -59,12 +57,9 @@ interface TokenNameFormValue {
   standalone: false,
 })
 export class QueryGetIcalUrlModalComponent extends OpModalComponent implements OnInit {
-  public readonly elementRef = inject(ElementRef);
-  public locals:OpModalLocalsMap = inject(OpModalLocalsToken);
   public readonly I18n = inject(I18nService);
   public readonly states = inject(States);
   public readonly querySpace = inject(IsolatedQuerySpace);
-  public readonly cdRef = inject(ChangeDetectorRef);
   public readonly wpListService = inject(WorkPackagesListService);
   public readonly halNotification = inject(HalResourceNotificationService);
   public readonly toastService = inject(ToastService);
@@ -103,15 +98,6 @@ export class QueryGetIcalUrlModalComponent extends OpModalComponent implements O
     return this.tokenNameForm.get('name');
   }
 
-  constructor() {
-    // Pass required deps to the base class using inject()
-    super(
-      inject(OpModalLocalsToken),
-      inject(ChangeDetectorRef),
-      inject(ElementRef),
-    );
-  }
-
   ngOnInit():void {
     super.ngOnInit();
 
diff --git a/frontend/src/app/shared/components/modals/modal-wrapper/dynamic-content.modal.ts b/frontend/src/app/shared/components/modals/modal-wrapper/dynamic-content.modal.ts
index aaeb738273e..3bd2f42d5a4 100644
--- a/frontend/src/app/shared/components/modals/modal-wrapper/dynamic-content.modal.ts
+++ b/frontend/src/app/shared/components/modals/modal-wrapper/dynamic-content.modal.ts
@@ -26,17 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -46,14 +36,7 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   standalone: false,
 })
 export class DynamicContentModalComponent extends OpModalComponent implements OnInit, OnDestroy {
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
+  readonly I18n = inject(I18nService);
 
   ngOnInit():void {
     super.ngOnInit();
diff --git a/frontend/src/app/shared/components/modals/save-modal/save-query.modal.ts b/frontend/src/app/shared/components/modals/save-modal/save-query.modal.ts
index 4d995a893c5..57d15b7c870 100644
--- a/frontend/src/app/shared/components/modals/save-modal/save-query.modal.ts
+++ b/frontend/src/app/shared/components/modals/save-modal/save-query.modal.ts
@@ -26,15 +26,11 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, ViewChild, inject } from '@angular/core';
 import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { QuerySharingChange } from 'core-app/shared/components/modals/share-modal/query-sharing-form.component';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
@@ -50,6 +46,13 @@ import { States } from 'core-app/core/states/states.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class SaveQueryModalComponent extends OpModalComponent {
+  readonly I18n = inject(I18nService);
+  readonly states = inject(States);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpListService = inject(WorkPackagesListService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly toastService = inject(ToastService);
+
   public queryName = '';
 
   public isStarred = false;
@@ -71,20 +74,6 @@ export class SaveQueryModalComponent extends OpModalComponent {
     close_popup: this.I18n.t('js.close_popup_title'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService,
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpListService:WorkPackagesListService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly toastService:ToastService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   public setValues(change:QuerySharingChange):void {
     this.isStarred = change.isStarred;
     this.isPublic = change.isPublic;
diff --git a/frontend/src/app/shared/components/modals/share-modal/query-sharing-form.component.ts b/frontend/src/app/shared/components/modals/share-modal/query-sharing-form.component.ts
index 85f4ebb2b8e..8e88f54c4e6 100644
--- a/frontend/src/app/shared/components/modals/share-modal/query-sharing-form.component.ts
+++ b/frontend/src/app/shared/components/modals/share-modal/query-sharing-form.component.ts
@@ -1,8 +1,6 @@
 import { States } from 'core-app/core/states/states.service';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
-import {
-  ChangeDetectionStrategy, Component, EventEmitter, Input, Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 
@@ -21,6 +19,11 @@ export interface QuerySharingChange {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class QuerySharingFormComponent {
+  readonly states = inject(States);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly authorisationService = inject(AuthorisationService);
+  readonly I18n = inject(I18nService);
+
   @Input() public isSave:boolean;
 
   @Input() public isStarred:boolean;
@@ -37,12 +40,6 @@ export class QuerySharingFormComponent {
     visibleForOthersText: this.I18n.t('js.work_packages.query.public_text'),
   };
 
-  constructor(readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly authorisationService:AuthorisationService,
-    readonly I18n:I18nService) {
-  }
-
   public get canStar() {
     return this.isSave
       || this.authorisationService.can('query', 'star')
diff --git a/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.ts b/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.ts
index 26f2ba6be32..cdf9e7febae 100644
--- a/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.ts
+++ b/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.ts
@@ -32,11 +32,7 @@ import { HalResourceNotificationService } from 'core-app/features/hal/services/h
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
 import { QuerySharingChange } from 'core-app/shared/components/modals/share-modal/query-sharing-form.component';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
@@ -50,6 +46,13 @@ import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/q
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class QuerySharingModalComponent extends OpModalComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly states = inject(States);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpListService = inject(WorkPackagesListService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly toastService = inject(ToastService);
+
   public query:QueryResource;
 
   public isStarred = false;
@@ -69,20 +72,6 @@ export class QuerySharingModalComponent extends OpModalComponent implements OnIn
     close_popup: this.I18n.t('js.close_popup_title'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService,
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly cdRef:ChangeDetectorRef,
-    readonly wpListService:WorkPackagesListService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly toastService:ToastService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit():void {
     super.ngOnInit();
 
diff --git a/frontend/src/app/shared/components/modals/view-settings-modal/view-settings.modal.ts b/frontend/src/app/shared/components/modals/view-settings-modal/view-settings.modal.ts
index 5ca35da8f1b..b6fa3dd5aa1 100644
--- a/frontend/src/app/shared/components/modals/view-settings-modal/view-settings.modal.ts
+++ b/frontend/src/app/shared/components/modals/view-settings-modal/view-settings.modal.ts
@@ -26,13 +26,11 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, ViewChild, inject } from '@angular/core';
 import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { QuerySharingChange } from 'core-app/shared/components/modals/share-modal/query-sharing-form.component';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
@@ -48,6 +46,14 @@ import { WorkPackagesQueryViewService } from 'core-app/features/work-packages/co
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class ViewSettingsModalComponent extends OpModalComponent {
+  readonly I18n = inject(I18nService);
+  readonly states = inject(States);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpListService = inject(WorkPackagesListService);
+  readonly wpView = inject(WorkPackagesQueryViewService);
+  readonly halNotification = inject(HalResourceNotificationService);
+  readonly toastService = inject(ToastService);
+
   public queryName = '';
 
   public isStarred = false;
@@ -69,21 +75,6 @@ export class ViewSettingsModalComponent extends OpModalComponent {
     close_popup: this.I18n.t('js.close_popup_title'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly I18n:I18nService,
-    readonly states:States,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpListService:WorkPackagesListService,
-    readonly wpView:WorkPackagesQueryViewService,
-    readonly halNotification:HalResourceNotificationService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly toastService:ToastService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   public setValues(change:QuerySharingChange):void {
     this.isStarred = change.isStarred;
     this.isPublic = change.isPublic;
diff --git a/frontend/src/app/shared/components/no-results/no-results.component.ts b/frontend/src/app/shared/components/no-results/no-results.component.ts
index e2cd35986f3..30166e10ddd 100644
--- a/frontend/src/app/shared/components/no-results/no-results.component.ts
+++ b/frontend/src/app/shared/components/no-results/no-results.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, HostBinding, Input, inject } from '@angular/core';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 
 
@@ -37,6 +37,8 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   standalone: false,
 })
 export class NoResultsComponent {
+  readonly elementRef = inject(ElementRef);
+
   @Input() title:string;
 
   @Input() description:string;
@@ -45,9 +47,7 @@ export class NoResultsComponent {
 
   @HostBinding('class.generic-table--no-results-container') setHostClass = true;
 
-  constructor(
-    readonly elementRef:ElementRef,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 }
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/op-columns-context-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/op-columns-context-menu.directive.ts
index 36746d38b6d..17599bf9545 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/op-columns-context-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/op-columns-context-menu.directive.ts
@@ -26,13 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  Directive, ElementRef, Injector, Input,
-} from '@angular/core';
+import { Directive, Injector, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { WorkPackageViewColumnsService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-columns.service';
 import { WorkPackageViewGroupByService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service';
@@ -50,6 +47,15 @@ import { computePosition, ComputePositionReturn, flip, shift } from '@floating-u
   standalone: false,
 })
 export class OpColumnsContextMenu extends OpContextMenuTrigger {
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly wpTableSortBy = inject(WorkPackageViewSortByService);
+  readonly wpTableGroupBy = inject(WorkPackageViewGroupByService);
+  readonly wpTableHierarchies = inject(WorkPackageViewHierarchiesService);
+  readonly opModalService = inject(OpModalService);
+  readonly injector = inject(Injector);
+  readonly I18n = inject(I18nService);
+  readonly confirmDialog = inject(ConfirmDialogService);
+
   @Input('opColumnsContextMenu-column') public column:QueryColumn;
 
   @Input('opColumnsContextMenu-table') public table:WorkPackageTable;
@@ -61,19 +67,6 @@ export class OpColumnsContextMenu extends OpContextMenuTrigger {
     },
   };
 
-  constructor(readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly wpTableSortBy:WorkPackageViewSortByService,
-    readonly wpTableGroupBy:WorkPackageViewGroupByService,
-    readonly wpTableHierarchies:WorkPackageViewHierarchiesService,
-    readonly opModalService:OpModalService,
-    readonly injector:Injector,
-    readonly I18n:I18nService,
-    readonly confirmDialog:ConfirmDialogService) {
-    super(elementRef, opContextMenu);
-  }
-
   protected open(evt:Event) {
     if (!this.table.configuration.columnMenuEnabled) {
       return;
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive.ts
index 37a1abf8d20..5cb23213f89 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Directive, ElementRef } from '@angular/core';
+import { AfterViewInit, Directive, ElementRef, inject } from '@angular/core';
 import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { OpContextMenuHandler } from 'core-app/shared/components/op-context-menu/op-context-menu-handler';
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
@@ -10,15 +10,19 @@ import { computePosition, ComputePositionReturn, flip, shift } from '@floating-u
   standalone: false,
 })
 export class OpContextMenuTrigger extends OpContextMenuHandler implements AfterViewInit {
+  readonly elementRef = inject(ElementRef);
+  readonly opContextMenu:OPContextMenuService;
+
   protected element:HTMLElement;
 
   protected items:OpContextMenuItem[] = [];
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-  ) {
+  constructor() {
+    const opContextMenu = inject(OPContextMenuService);
+
     super(opContextMenu);
+
+    this.opContextMenu = opContextMenu;
   }
 
   ngAfterViewInit():void {
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/op-settings-dropdown-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/op-settings-dropdown-menu.directive.ts
index 063aceef3ed..af330ba1100 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/op-settings-dropdown-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/op-settings-dropdown-menu.directive.ts
@@ -26,13 +26,12 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Directive, ElementRef, Injector, Input, AfterViewInit } from '@angular/core';
+import { Directive, Injector, Input, AfterViewInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service';
 import {
   OpContextMenuTrigger,
 } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { States } from 'core-app/core/states/states.service';
 import { WorkPackagesListService } from 'core-app/features/work-packages/components/wp-list/wp-list.service';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
@@ -67,6 +66,18 @@ import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service
   standalone: false,
 })
 export class OpSettingsMenuDirective extends OpContextMenuTrigger implements AfterViewInit {
+  readonly opModalService = inject(OpModalService);
+  readonly wpListService = inject(WorkPackagesListService);
+  readonly authorisationService = inject(AuthorisationService);
+  readonly states = inject(States);
+  readonly injector = inject(Injector);
+  readonly querySpace = inject(IsolatedQuerySpace);
+  readonly wpTableColumns = inject(WorkPackageViewColumnsService);
+  readonly urlParamsHelper = inject(UrlParamsHelperService);
+  readonly opStaticQueries = inject(StaticQueriesService);
+  readonly turboRequests = inject(TurboRequestsService);
+  readonly I18n = inject(I18nService);
+
   @Input('opSettingsContextMenu-query') public query:QueryResource;
 
   @Input() public hideTableOptions:boolean;
@@ -79,24 +90,6 @@ export class OpSettingsMenuDirective extends OpContextMenuTrigger implements Aft
 
   override readonly placement = 'bottom-end';
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly opModalService:OpModalService,
-    readonly wpListService:WorkPackagesListService,
-    readonly authorisationService:AuthorisationService,
-    readonly states:States,
-    readonly injector:Injector,
-    readonly querySpace:IsolatedQuerySpace,
-    readonly wpTableColumns:WorkPackageViewColumnsService,
-    readonly urlParamsHelper:UrlParamsHelperService,
-    readonly opStaticQueries:StaticQueriesService,
-    readonly turboRequests:TurboRequestsService,
-    readonly I18n:I18nService,
-  ) {
-    super(elementRef, opContextMenu);
-  }
-
   ngAfterViewInit():void {
     super.ngAfterViewInit();
 
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/op-types-context-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/op-types-context-menu.directive.ts
index c1686c10b76..8a82c763309 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/op-types-context-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/op-types-context-menu.directive.ts
@@ -28,12 +28,7 @@
 
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
 import { StateService } from '@uirouter/core';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import {
-  Directive,
-  ElementRef,
-  Input, AfterViewInit,
-} from '@angular/core';
+import { Directive, Input, AfterViewInit, inject } from '@angular/core';
 import { isClickedWithModifier } from 'core-app/shared/helpers/link-handling/link-handling';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { WorkPackageCreateService } from 'core-app/features/work-packages/components/wp-new/wp-create.service';
@@ -49,6 +44,12 @@ import { BrowserDetector } from 'core-app/core/browser/browser-detector.service'
   standalone: false,
 })
 export class OpTypesContextMenuDirective extends OpContextMenuTrigger implements AfterViewInit {
+  readonly wpCreate = inject(WorkPackageCreateService);
+  readonly $state = inject(StateService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly currentProject = inject(CurrentProjectService);
+  readonly browser = inject(BrowserDetector);
+
   @Input() public projectIdentifier:string|null|undefined;
 
   @Input() public stateName:string;
@@ -59,18 +60,6 @@ export class OpTypesContextMenuDirective extends OpContextMenuTrigger implements
 
   public isOpen = false;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly wpCreate:WorkPackageCreateService,
-    readonly $state:StateService,
-    readonly pathHelper:PathHelperService,
-    readonly currentProject:CurrentProjectService,
-    readonly browser:BrowserDetector,
-  ) {
-    super(elementRef, opContextMenu);
-  }
-
   ngAfterViewInit():void {
     super.ngAfterViewInit();
 
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/wp-create-settings-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/wp-create-settings-menu.directive.ts
index cded83e7fa9..407e97aa6af 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/wp-create-settings-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/wp-create-settings-menu.directive.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef } from '@angular/core';
+import { Directive, inject } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
 import { States } from 'core-app/core/states/states.service';
@@ -38,15 +37,11 @@ import { FormResource } from 'core-app/features/hal/resources/form-resource';
   standalone: false,
 })
 export class WorkPackageCreateSettingsMenuDirective extends OpContextMenuTrigger {
+  readonly states = inject(States);
+  readonly halEditing = inject(HalResourceEditingService);
+
   override readonly placement = 'bottom-end';
   
-  constructor(readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly states:States,
-    readonly halEditing:HalResourceEditingService) {
-    super(elementRef, opContextMenu);
-  }
-
   protected open(evt:Event) {
     const wp = this.states.workPackages.get('new').value;
 
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/wp-group-toggle-dropdown-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/wp-group-toggle-dropdown-menu.directive.ts
index 56087eca2eb..9ada72eeb95 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/wp-group-toggle-dropdown-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/wp-group-toggle-dropdown-menu.directive.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef } from '@angular/core';
+import { Directive, inject } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewCollapsedGroupsService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-collapsed-groups.service';
@@ -37,12 +36,8 @@ import { WorkPackageViewCollapsedGroupsService } from 'core-app/features/work-pa
   standalone: false,
 })
 export class WorkPackageGroupToggleDropdownMenuDirective extends OpContextMenuTrigger {
-  constructor(readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly I18n:I18nService,
-    readonly wpViewCollapsedGroups:WorkPackageViewCollapsedGroupsService) {
-    super(elementRef, opContextMenu);
-  }
+  readonly I18n = inject(I18nService);
+  readonly wpViewCollapsedGroups = inject(WorkPackageViewCollapsedGroupsService);
 
   protected open(evt:Event) {
     this.buildItems();
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/wp-status-dropdown-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/wp-status-dropdown-menu.directive.ts
index 2e62a54fd94..e19d5be5c45 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/wp-status-dropdown-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/wp-status-dropdown-menu.directive.ts
@@ -27,8 +27,7 @@
 //++
 
 import { StateService } from '@uirouter/core';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef, Input } from '@angular/core';
+import { Directive, Input, inject } from '@angular/core';
 import {
   OpContextMenuTrigger
 } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
@@ -56,18 +55,15 @@ import { HalError } from 'core-app/features/hal/services/hal-error';
   standalone: false,
 })
 export class WorkPackageStatusDropdownDirective extends OpContextMenuTrigger {
-  @Input('wpStatusDropdown-workPackage') public workPackage:WorkPackageResource;
+  readonly $state = inject(StateService);
+  protected workPackageNotificationService = inject(WorkPackageNotificationService);
+  protected halEditing = inject(HalResourceEditingService);
+  protected toastService = inject(ToastService);
+  protected I18n = inject(I18nService);
+  protected halEvents = inject(HalEventsService);
 
-  constructor(readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly $state:StateService,
-    protected workPackageNotificationService:WorkPackageNotificationService,
-    protected halEditing:HalResourceEditingService,
-    protected toastService:ToastService,
-    protected I18n:I18nService,
-    protected halEvents:HalEventsService) {
-    super(elementRef, opContextMenu);
-  }
+  // eslint-disable-next-line @angular-eslint/no-input-rename
+  @Input('wpStatusDropdown-workPackage') public workPackage:WorkPackageResource;
 
   protected open(evt:Event) {
     const change = this.halEditing.changeFor(this.workPackage);
diff --git a/frontend/src/app/shared/components/op-context-menu/handlers/wp-view-dropdown-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/handlers/wp-view-dropdown-menu.directive.ts
index 83ab62e6d0a..246d7d86743 100644
--- a/frontend/src/app/shared/components/op-context-menu/handlers/wp-view-dropdown-menu.directive.ts
+++ b/frontend/src/app/shared/components/op-context-menu/handlers/wp-view-dropdown-menu.directive.ts
@@ -26,8 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef } from '@angular/core';
+import { Directive, inject } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
@@ -42,15 +41,9 @@ import { WorkPackageViewTimelineService } from 'core-app/features/work-packages/
   standalone: false,
 })
 export class WorkPackageViewDropdownMenuDirective extends OpContextMenuTrigger {
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly I18n:I18nService,
-    readonly wpDisplayRepresentationService:WorkPackageViewDisplayRepresentationService,
-    readonly wpTableTimeline:WorkPackageViewTimelineService,
-  ) {
-    super(elementRef, opContextMenu);
-  }
+  readonly I18n = inject(I18nService);
+  readonly wpDisplayRepresentationService = inject(WorkPackageViewDisplayRepresentationService);
+  readonly wpTableTimeline = inject(WorkPackageViewTimelineService);
 
   public isOpen = false;
 
diff --git a/frontend/src/app/shared/components/op-context-menu/icon-triggered-context-menu/icon-triggered-context-menu.component.ts b/frontend/src/app/shared/components/op-context-menu/icon-triggered-context-menu/icon-triggered-context-menu.component.ts
index e44f1a57d63..b131d02b941 100644
--- a/frontend/src/app/shared/components/op-context-menu/icon-triggered-context-menu/icon-triggered-context-menu.component.ts
+++ b/frontend/src/app/shared/components/op-context-menu/icon-triggered-context-menu/icon-triggered-context-menu.component.ts
@@ -26,12 +26,11 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector, Input } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Injector, Input, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
   OpContextMenuTrigger,
 } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
 
@@ -46,18 +45,12 @@ import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class IconTriggeredContextMenuComponent extends OpContextMenuTrigger {
-  override readonly placement = 'bottom-end';
+  readonly opModalService = inject(OpModalService);
+  readonly injector = inject(Injector);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly I18n = inject(I18nService);
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly opContextMenu:OPContextMenuService,
-    readonly opModalService:OpModalService,
-    readonly injector:Injector,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-  ) {
-    super(elementRef, opContextMenu);
-  }
+  override readonly placement = 'bottom-end';
 
   @Input() menuItemsFactory:() => Promise<OpContextMenuItem[]>;
   @Input() customAriaLabel:string = this.I18n.t('js.label_open_menu');
diff --git a/frontend/src/app/shared/components/op-context-menu/op-context-menu.component.ts b/frontend/src/app/shared/components/op-context-menu/op-context-menu.component.ts
index 9da13c47753..4e38ece9f22 100644
--- a/frontend/src/app/shared/components/op-context-menu/op-context-menu.component.ts
+++ b/frontend/src/app/shared/components/op-context-menu/op-context-menu.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import {
   OpContextMenuItem,
   OpContextMenuLocalsMap,
@@ -15,11 +15,13 @@ import { OPContextMenuService } from 'core-app/shared/components/op-context-menu
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class OPContextMenuComponent {
+  locals = inject<OpContextMenuLocalsMap>(OpContextMenuLocalsToken);
+
   public items:OpContextMenuItem[];
 
   public service:OPContextMenuService;
 
-  constructor(@Inject(OpContextMenuLocalsToken) public locals:OpContextMenuLocalsMap) {
+  constructor() {
     this.items = this.locals.items.filter((item) => !item?.hidden);
     this.service = this.locals.service;
   }
diff --git a/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts b/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts
index a03b9a474e5..76c4a2ad7a0 100644
--- a/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts
+++ b/frontend/src/app/shared/components/op-context-menu/op-context-menu.service.ts
@@ -1,4 +1,4 @@
-import { ApplicationRef, Injectable, Injector } from '@angular/core';
+import { ApplicationRef, Injectable, Injector, inject } from '@angular/core';
 import { ComponentPortal, ComponentType, DomPortalOutlet } from '@angular/cdk/portal';
 import { TransitionService } from '@uirouter/core';
 import { OpContextMenuHandler } from 'core-app/shared/components/op-context-menu/op-context-menu-handler';
@@ -11,6 +11,11 @@ import { FocusHelperService } from 'core-app/shared/directives/focus/focus-helpe
 
 @Injectable({ providedIn: 'root' })
 export class OPContextMenuService {
+  readonly FocusHelper = inject(FocusHelperService);
+  private appRef = inject(ApplicationRef);
+  private $transitions = inject(TransitionService);
+  private injector = inject(Injector);
+
   public active:OpContextMenuHandler|null = null;
 
   // Hold a reference to the DOM node we're using as a host
@@ -23,14 +28,6 @@ export class OPContextMenuService {
   private isOpening = false;
   private openSeq = 0;
 
-  constructor(
-    readonly FocusHelper:FocusHelperService,
-    private appRef:ApplicationRef,
-    private $transitions:TransitionService,
-    private injector:Injector,
-  ) {
-  }
-
   public register() {
     const existing = document.querySelector('.op-context-menu--overlay');
     existing?.remove();
diff --git a/frontend/src/app/shared/components/op-non-working-days-list/op-non-working-days-list.component.ts b/frontend/src/app/shared/components/op-non-working-days-list/op-non-working-days-list.component.ts
index 014372b5a13..c545e4107d5 100644
--- a/frontend/src/app/shared/components/op-non-working-days-list/op-non-working-days-list.component.ts
+++ b/frontend/src/app/shared/components/op-non-working-days-list/op-non-working-days-list.component.ts
@@ -1,16 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Injector,
-  Input,
-  OnInit,
-  ViewChild,
-  ViewEncapsulation,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Injector, Input, OnInit, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { BannersService } from 'core-app/core/enterprise/banners.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { OpModalService } from '../modal/modal.service';
@@ -47,6 +35,18 @@ export interface INonWorkingDay {
   standalone: false,
 })
 export class OpNonWorkingDaysListComponent implements OnInit, AfterViewInit {
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  protected I18n = inject(I18nService);
+  readonly bannersService = inject(BannersService);
+  readonly opModalService = inject(OpModalService);
+  readonly injector = inject(Injector);
+  readonly pathHelper = inject(PathHelperService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly dayService = inject(DayResourceService);
+  readonly confirmDialogService = inject(ConfirmDialogService);
+  readonly toast = inject(ToastService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @ViewChild(FullCalendarComponent) ucCalendar:FullCalendarComponent;
 
   @HostBinding('class.op-non-working-days-list') className = true;
@@ -119,19 +119,7 @@ export class OpNonWorkingDaysListComponent implements OnInit, AfterViewInit {
 
   };
 
-  constructor(
-    readonly elementRef:ElementRef<HTMLElement>,
-    protected I18n:I18nService,
-    readonly bannersService:BannersService,
-    readonly opModalService:OpModalService,
-    readonly injector:Injector,
-    readonly pathHelper:PathHelperService,
-    readonly apiV3Service:ApiV3Service,
-    readonly dayService:DayResourceService,
-    readonly confirmDialogService:ConfirmDialogService,
-    readonly toast:ToastService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
     this.listenToFormSubmit();
   }
diff --git a/frontend/src/app/shared/components/op-view-select/op-static-queries.service.ts b/frontend/src/app/shared/components/op-view-select/op-static-queries.service.ts
index 3cf7f4db7de..3057256ae53 100644
--- a/frontend/src/app/shared/components/op-view-select/op-static-queries.service.ts
+++ b/frontend/src/app/shared/components/op-view-select/op-static-queries.service.ts
@@ -28,16 +28,14 @@
 
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { StateService } from '@uirouter/core';
 
 @Injectable()
 export class StaticQueriesService {
-  constructor(
-    private readonly I18n:I18nService,
-    private readonly $state:StateService,
-  ) {
-  }
+  private readonly I18n = inject(I18nService);
+  private readonly $state = inject(StateService);
+
 
   public text = {
     work_packages: this.I18n.t('js.label_work_package_plural'),
diff --git a/frontend/src/app/shared/components/option-list/option-list.component.ts b/frontend/src/app/shared/components/option-list/option-list.component.ts
index c0ec3addba0..a9202456188 100644
--- a/frontend/src/app/shared/components/option-list/option-list.component.ts
+++ b/frontend/src/app/shared/components/option-list/option-list.component.ts
@@ -1,13 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  forwardRef,
-  HostBinding,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, forwardRef, HostBinding, Input, Output, inject } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 export interface IOpOptionListOption<T> {
@@ -35,9 +26,9 @@ export type IOpOptionListValue<T> = T|null;
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class OpOptionListComponent<T> implements ControlValueAccessor {
-  @HostBinding('class.op-option-list') className = true;
+  private cdRef = inject(ChangeDetectorRef);
 
-  constructor(private cdRef:ChangeDetectorRef) {}
+  @HostBinding('class.op-option-list') className = true;
 
   @Input() options:IOpOptionListOption<T>[] = [];
 
diff --git a/frontend/src/app/shared/components/persistent-toggle/persistent-toggle.component.ts b/frontend/src/app/shared/components/persistent-toggle/persistent-toggle.component.ts
index 7b3d3497f2d..4f55e5920b6 100644
--- a/frontend/src/app/shared/components/persistent-toggle/persistent-toggle.component.ts
+++ b/frontend/src/app/shared/components/persistent-toggle/persistent-toggle.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, inject } from '@angular/core';
 import { slideDown, slideUp } from 'es6-slide-up-down';
 
 
@@ -40,6 +40,8 @@ import { slideDown, slideUp } from 'es6-slide-up-down';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PersistentToggleComponent implements OnInit {
+  private elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+
   /** Unique identifier of the toggle */
   private identifier:string;
 
@@ -51,9 +53,6 @@ export class PersistentToggleComponent implements OnInit {
 
   private targetNotification:HTMLElement|null;
 
-  constructor(private elementRef:ElementRef<HTMLElement>) {
-  }
-
   ngOnInit():void {
     this.element = this.elementRef.nativeElement;
     this.targetNotification = this.getTargetNotification();
diff --git a/frontend/src/app/shared/components/principal/principal-renderer.service.ts b/frontend/src/app/shared/components/principal/principal-renderer.service.ts
index c2df62d6360..23fb5f1b5bc 100644
--- a/frontend/src/app/shared/components/principal/principal-renderer.service.ts
+++ b/frontend/src/app/shared/components/principal/principal-renderer.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { colorModes, ColorsService } from 'core-app/shared/components/colors/colors.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -28,12 +28,10 @@ export interface NameOptions {
 
 @Injectable({ providedIn: 'root' })
 export class PrincipalRendererService {
-  constructor(
-    private pathHelper:PathHelperService,
-    private apiV3Service:ApiV3Service,
-    private colors:ColorsService,
-  ) {
-  }
+  private pathHelper = inject(PathHelperService);
+  private apiV3Service = inject(ApiV3Service);
+  private colors = inject(ColorsService);
+
 
   renderAbbreviated(
     container:HTMLElement,
diff --git a/frontend/src/app/shared/components/principal/principal-rendering.module.ts b/frontend/src/app/shared/components/principal/principal-rendering.module.ts
index 18573122c0e..526d0db7162 100644
--- a/frontend/src/app/shared/components/principal/principal-rendering.module.ts
+++ b/frontend/src/app/shared/components/principal/principal-rendering.module.ts
@@ -1,4 +1,4 @@
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { OpPrincipalComponent } from './principal.component';
 import { PrincipalRendererService } from './principal-renderer.service';
@@ -18,6 +18,5 @@ import { PrincipalRendererService } from './principal-renderer.service';
   ],
 })
 export class OpenprojectPrincipalRenderingModule {
-  constructor(readonly injector:Injector) {
-  }
+  readonly injector = inject(Injector);
 }
diff --git a/frontend/src/app/shared/components/principal/principal.component.ts b/frontend/src/app/shared/components/principal/principal.component.ts
index 069affe9e5f..a65a1bfa7af 100644
--- a/frontend/src/app/shared/components/principal/principal.component.ts
+++ b/frontend/src/app/shared/components/principal/principal.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Input,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -62,6 +54,15 @@ export interface PrincipalInput {
   standalone: false,
 })
 export class OpPrincipalComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  readonly PathHelper = inject(PathHelperService);
+  readonly principalRenderer = inject(PrincipalRendererService);
+  readonly principalResourceService = inject(PrincipalsResourceService);
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly timezoneService = inject(TimezoneService);
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() principal:PrincipalLike;
 
   @Input() hideAvatar = false;
@@ -83,16 +84,7 @@ export class OpPrincipalComponent implements OnInit {
 
   @Input() title = '';
 
-  public constructor(
-    readonly elementRef:ElementRef,
-    readonly PathHelper:PathHelperService,
-    readonly principalRenderer:PrincipalRendererService,
-    readonly principalResourceService:PrincipalsResourceService,
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly timezoneService:TimezoneService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
+  public constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/project-include/list/project-include-list.component.ts b/frontend/src/app/shared/components/project-include/list/project-include-list.component.ts
index 395f916cdd6..aa0b211d376 100644
--- a/frontend/src/app/shared/components/project-include/list/project-include-list.component.ts
+++ b/frontend/src/app/shared/components/project-include/list/project-include-list.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  HostBinding,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, HostBinding, Input, Output, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -54,6 +47,11 @@ import { getMetaContent } from 'core-app/core/setup/globals/global-helpers';
   standalone: false,
 })
 export class OpProjectIncludeListComponent {
+  readonly I18n = inject(I18nService);
+  readonly currentProjectService = inject(CurrentProjectService);
+  readonly pathHelper = inject(PathHelperService);
+  readonly searchableProjectListService = inject(SearchableProjectListService);
+
   @HostBinding('class.spot-list') classNameList = true;
 
   @HostBinding('class.op-project-include-list') className = true;
@@ -80,13 +78,6 @@ export class OpProjectIncludeListComponent {
     current_project: this.I18n.t('js.include_projects.tooltip.current_project'),
   };
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly currentProjectService:CurrentProjectService,
-    readonly pathHelper:PathHelperService,
-    readonly searchableProjectListService:SearchableProjectListService,
-  ) { }
-
   public updateList(selected:string[]):void {
     this.update.emit(selected);
   }
diff --git a/frontend/src/app/shared/components/project-include/project-include.component.ts b/frontend/src/app/shared/components/project-include/project-include.component.ts
index 88cc7e873e2..a231658a75f 100644
--- a/frontend/src/app/shared/components/project-include/project-include.component.ts
+++ b/frontend/src/app/shared/components/project-include/project-include.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, OnDestroy, OnInit, inject } from '@angular/core';
 import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
 import {
   debounceTime,
@@ -56,6 +50,7 @@ import {
 import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
+import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
 import { IProject } from 'core-app/core/state/projects/project.model';
 import {
   SearchableProjectListService,
@@ -77,6 +72,13 @@ import { calculatePositions } from 'core-app/shared/components/project-include/c
   standalone: false,
 })
 export class OpProjectIncludeComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  readonly I18n = inject(I18nService);
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpIncludeSubprojects = inject(WorkPackageViewIncludeSubprojectsService);
+  readonly halResourceService = inject(HalResourceService);
+  readonly searchableProjectListService = inject(SearchableProjectListService);
+  readonly querySpace = inject(IsolatedQuerySpace);
+
   @HostBinding('class.op-project-include') className = true;
 
   public text = {
@@ -95,7 +97,7 @@ export class OpProjectIncludeComponent extends UntilDestroyedMixin implements On
 
   public textFieldFocused = false;
 
-  public query$ = this.wpTableFilters.querySpace.query.values$();
+  public query$ = this.querySpace.query.values$();
 
   public displayModeOptions = [
     { value: 'all', title: this.text.filter_all },
@@ -258,13 +260,7 @@ export class OpProjectIncludeComponent extends UntilDestroyedMixin implements On
 
   public loading$ = new BehaviorSubject<boolean>(false);
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpIncludeSubprojects:WorkPackageViewIncludeSubprojectsService,
-    readonly halResourceService:HalResourceService,
-    readonly searchableProjectListService:SearchableProjectListService,
-  ) {
+  constructor() {
     super();
 
     this.projects$
diff --git a/frontend/src/app/shared/components/remote-field-updater/remote-field-updater.component.ts b/frontend/src/app/shared/components/remote-field-updater/remote-field-updater.component.ts
index 55606662e31..d4f4d52e9dc 100644
--- a/frontend/src/app/shared/components/remote-field-updater/remote-field-updater.component.ts
+++ b/frontend/src/app/shared/components/remote-field-updater/remote-field-updater.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, OnDestroy, OnInit, inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
 export const remoteFieldUpdaterSelector = 'remote-field-updater';
@@ -38,11 +38,9 @@ export const remoteFieldUpdaterSelector = 'remote-field-updater';
   standalone: false,
 })
 export class RemoteFieldUpdaterComponent implements OnInit, OnDestroy {
-  constructor(
-    private elementRef:ElementRef,
-    private http:HttpClient,
-  ) {
-  }
+  private elementRef = inject(ElementRef);
+  private http = inject(HttpClient);
+
 
   private url:string;
 
diff --git a/frontend/src/app/shared/components/resizer/resizer/wp-resizer.component.ts b/frontend/src/app/shared/components/resizer/resizer/wp-resizer.component.ts
index 85eae84d39a..fe333a67d1c 100644
--- a/frontend/src/app/shared/components/resizer/resizer/wp-resizer.component.ts
+++ b/frontend/src/app/shared/components/resizer/resizer/wp-resizer.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, OnDestroy } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, OnDestroy, inject } from '@angular/core';
 import { debounceTime } from 'rxjs/operators';
 import { TransitionService } from '@uirouter/core';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
@@ -47,6 +47,9 @@ import { fromEvent } from 'rxjs';
   standalone: false,
 })
 export class WpResizerComponent extends UntilDestroyedMixin implements OnInit, AfterViewInit, OnDestroy {
+  private elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  readonly $transitions = inject(TransitionService);
+
   @Input() elementClass:string;
 
   @Input() resizeEvent:string;
@@ -70,13 +73,6 @@ export class WpResizerComponent extends UntilDestroyedMixin implements OnInit, A
 
   public resizerClass = 'work-packages--resizer icon-resizer-vertical-lines';
 
-  constructor(
-    private elementRef:ElementRef<HTMLElement>,
-    readonly $transitions:TransitionService,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     // Get element
     // We use this more complicated approach of taking the last element of the class as it allows
diff --git a/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts b/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts
index e83ce6f2914..04055898ec0 100644
--- a/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts
+++ b/frontend/src/app/shared/components/searchable-project-list/searchable-project-list.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   ApiV3ListFilter,
   ApiV3ListParameters,
@@ -20,6 +20,11 @@ const UNDISCLOSED_ANCESTOR = 'urn:openproject-org:api:v3:undisclosed';
 
 @Injectable()
 export class SearchableProjectListService {
+  readonly http = inject(HttpClient);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly currentProjectService = inject(CurrentProjectService);
+  readonly configurationService = inject(ConfigurationService);
+
   private _searchText = '';
   private searchText$ = new BehaviorSubject<string>('');
   private loadingEnabled$ = new BehaviorSubject<boolean>(false);
@@ -123,13 +128,6 @@ export class SearchableProjectListService {
     })
   );
 
-  constructor(
-    readonly http:HttpClient,
-    readonly apiV3Service:ApiV3Service,
-    readonly currentProjectService:CurrentProjectService,
-    readonly configurationService:ConfigurationService,
-  ) { }
-
   /** Causes fetching of a new project list and enables reloads of the project list, when the searchText changes. */
   public enableLoading():void {
     this.loadingEnabled$.next(true);
diff --git a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
index b417a7f50d0..0c775134787 100644
--- a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
+++ b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
@@ -26,19 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnChanges,
-  OnInit,
-  Output,
-  SimpleChanges,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
@@ -64,6 +52,11 @@ import SpotDropAlignmentOption from 'core-app/spot/drop-alignment-options';
   standalone: false,
 })
 export class FileLinkListItemComponent implements OnInit, OnChanges, AfterViewInit {
+  private readonly i18n = inject(I18nService);
+  private readonly timezoneService = inject(TimezoneService);
+  private readonly confirmDialogService = inject(ConfirmDialogService);
+  private readonly principalRendererService = inject(PrincipalRendererService);
+
   @Input() public fileLink:IFileLink;
 
   @Input() public allowEditing = false;
@@ -99,13 +92,6 @@ export class FileLinkListItemComponent implements OnInit, OnChanges, AfterViewIn
     notFoundTooltipText: this.i18n.t('js.storages.file_links.tooltip.not_found'),
   };
 
-  constructor(
-    private readonly i18n:I18nService,
-    private readonly timezoneService:TimezoneService,
-    private readonly confirmDialogService:ConfirmDialogService,
-    private readonly principalRendererService:PrincipalRendererService,
-  ) {}
-
   public get hasTooltip():boolean {
     return this.tooltip !== '';
   }
diff --git a/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.spec.ts b/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.spec.ts
index 34bdab2a5f5..25778cd214b 100644
--- a/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.spec.ts
+++ b/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.spec.ts
@@ -26,9 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectorRef, ElementRef } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
 import { Observable, config, throwError } from 'rxjs';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { SortFilesPipe } from 'core-app/shared/components/storages/pipes/sort-files.pipe';
 import { StorageFilesResourceService } from 'core-app/core/state/storage-files/storage-files.service';
 import { IStorageFile } from 'core-app/core/state/storage-files/storage-file.model';
@@ -36,11 +37,9 @@ import { FilePickerBaseModalComponent, } from 'core-app/shared/components/storag
 import { StorageFileListItem } from 'core-app/shared/components/storages/storage-file-list-item/storage-file-list-item';
 import type { Mock } from 'vitest';
 
+// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection,@angular-eslint/component-selector
+@Component({ selector: 'test-file-picker', template: '', standalone: false })
 class TestFilePickerBaseModalComponent extends FilePickerBaseModalComponent {
-  constructor(locals:OpModalLocalsMap, elementRef:ElementRef, cdRef:ChangeDetectorRef, sortFilesPipe:SortFilesPipe, storageFilesResourceService:StorageFilesResourceService) {
-    super(locals, elementRef, cdRef, sortFilesPipe, storageFilesResourceService);
-  }
-
   public loadDirectory(directory:IStorageFile):void {
     this.changeLevel(directory);
   }
@@ -59,8 +58,6 @@ describe('FilePickerBaseModalComponent', () => {
   }
 
   function buildComponent(spies:Spies) {
-    const cdRef = { detectChanges: spies.detectChanges } as unknown as ChangeDetectorRef;
-    const elementRef = { nativeElement: document.createElement('div') } as ElementRef;
     const locals = {
       service: { close: spies.close },
       storage: {
@@ -71,19 +68,27 @@ describe('FilePickerBaseModalComponent', () => {
         },
       },
       projectFolderMode: 'inactive',
-    } as unknown as OpModalLocalsMap;
-    const sortFilesPipe = { transform: (files:IStorageFile[]) => files } as SortFilesPipe;
-    const storageFilesResourceService = {
-      files: spies.files,
-      reset: spies.reset,
-    } as unknown as StorageFilesResourceService;
-    const component = new TestFilePickerBaseModalComponent(locals, elementRef, cdRef, sortFilesPipe, storageFilesResourceService);
+    };
 
+    TestBed.configureTestingModule({
+      declarations: [TestFilePickerBaseModalComponent],
+      providers: [
+        { provide: OpModalLocalsToken, useValue: locals },
+        { provide: ChangeDetectorRef, useValue: { detectChanges: spies.detectChanges } },
+        { provide: ElementRef, useValue: { nativeElement: document.createElement('div') } },
+        { provide: SortFilesPipe, useValue: { transform: (files:IStorageFile[]) => files } },
+        { provide: StorageFilesResourceService, useValue: { files: spies.files, reset: spies.reset } },
+      ],
+    });
+
+    const component = TestBed.runInInjectionContext(() => new TestFilePickerBaseModalComponent());
     component.ngOnInit();
 
-    return { component, cdRef, storageFilesResourceService };
+    return { component };
   }
 
+  afterEach(() => TestBed.resetTestingModule());
+
   it('cancels pending directory loading on destroy', () => {
     const teardown = vi.fn();
     const files$ = new Observable(() => teardown);
diff --git a/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts b/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts
index 81a47109c5d..7cc2ca720cf 100644
--- a/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts
+++ b/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts
@@ -26,14 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectorRef,
-  Directive,
-  ElementRef,
-  Inject,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { Directive, OnDestroy, OnInit, inject } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import {
   BehaviorSubject,
@@ -46,9 +39,7 @@ import { catchError, map } from 'rxjs/operators';
 
 import { IStorage } from 'core-app/core/state/storages/storage.model';
 import { IStorageFile } from 'core-app/core/state/storage-files/storage-file.model';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { SortFilesPipe } from 'core-app/shared/components/storages/pipes/sort-files.pipe';
 import { StorageFilesResourceService } from 'core-app/core/state/storage-files/storage-files.service';
 import { Breadcrumb, BreadcrumbsContent } from 'core-app/spot/components/breadcrumbs/breadcrumbs-content';
@@ -69,6 +60,9 @@ type Alert = 'none'|'noAccess'|'managedFolderNoAccess'|'managedFolderNotFound'|'
 
 @Directive()
 export abstract class FilePickerBaseModalComponent extends OpModalComponent implements OnInit, OnDestroy {
+  protected readonly sortFilesPipe = inject(SortFilesPipe);
+  protected readonly storageFilesResourceService = inject(StorageFilesResourceService);
+
   private loadingSubscription:Subscription;
 
   protected readonly storageFiles$ = new BehaviorSubject<IStorageFile[]>([]);
@@ -96,16 +90,6 @@ export abstract class FilePickerBaseModalComponent extends OpModalComponent impl
 
   public readonly loading$ = new BehaviorSubject<'loading'|'success'|'error'>('loading');
 
-  protected constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-    protected readonly sortFilesPipe:SortFilesPipe,
-    protected readonly storageFilesResourceService:StorageFilesResourceService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit():void {
     super.ngOnInit();
 
diff --git a/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.ts b/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.ts
index ee0f9478391..c0cdb850a13 100644
--- a/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.ts
+++ b/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.ts
@@ -26,9 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map, take } from 'rxjs/operators';
@@ -37,14 +35,10 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { IFileLink } from 'core-app/core/state/file-links/file-link.model';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import { IStorageFile } from 'core-app/core/state/storage-files/storage-file.model';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { SortFilesPipe } from 'core-app/shared/components/storages/pipes/sort-files.pipe';
 import { FileLinksResourceService } from 'core-app/core/state/file-links/file-links.service';
 import { isDirectory, storageLocaleString } from 'core-app/shared/components/storages/functions/storages.functions';
-import { StorageFilesResourceService } from 'core-app/core/state/storage-files/storage-files.service';
 import {
   StorageFileListItem, StorageFileListItemCheckbox,
 } from 'core-app/shared/components/storages/storage-file-list-item/storage-file-list-item';
@@ -58,6 +52,12 @@ import {
   standalone: false,
 })
 export class FilePickerModalComponent extends FilePickerBaseModalComponent {
+  private readonly i18n = inject(I18nService);
+  private readonly toastService = inject(ToastService);
+  private readonly timezoneService = inject(TimezoneService);
+  private readonly configuration = inject(ConfigurationService);
+  private readonly fileLinksResourceService = inject(FileLinksResourceService);
+
   public readonly text = {
     header: this.i18n.t('js.storages.file_links.select'),
     alertNoAccess: this.i18n.t('js.storages.files.project_folder_no_access'),
@@ -117,25 +117,8 @@ export class FilePickerModalComponent extends FilePickerBaseModalComponent {
 
   private readonly fileMap:Record<string, IStorageFile> = {};
 
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-    protected readonly sortFilesPipe:SortFilesPipe,
-    protected readonly storageFilesResourceService:StorageFilesResourceService,
-    private readonly i18n:I18nService,
-    private readonly toastService:ToastService,
-    private readonly timezoneService:TimezoneService,
-    private readonly configuration:ConfigurationService,
-    private readonly fileLinksResourceService:FileLinksResourceService,
-  ) {
-    super(
-      locals,
-      elementRef,
-      cdRef,
-      sortFilesPipe,
-      storageFilesResourceService,
-    );
+  constructor() {
+    super();
 
     this.showSelectAll = this.configuration.activeFeatureFlags.includes('storageFilePickingSelectAll');
   }
diff --git a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
index 5a996e398bd..c4a506950f7 100644
--- a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
+++ b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
@@ -26,26 +26,16 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
 import { IStorageFile } from 'core-app/core/state/storage-files/storage-file.model';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
-import { SortFilesPipe } from 'core-app/shared/components/storages/pipes/sort-files.pipe';
 import {
   isDirectory,
   makeFilesCollectionLink,
   storageLocaleString,
 } from 'core-app/shared/components/storages/functions/storages.functions';
-import { StorageFilesResourceService } from 'core-app/core/state/storage-files/storage-files.service';
 import {
   StorageFileListItem,
 } from 'core-app/shared/components/storages/storage-file-list-item/storage-file-list-item';
@@ -61,6 +51,9 @@ import { map } from 'rxjs/operators';
   standalone: false,
 })
 export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
+  private readonly i18n = inject(I18nService);
+  private readonly timezoneService = inject(TimezoneService);
+
   public submitted = false;
 
   public readonly text = {
@@ -138,24 +131,6 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
       );
   }
 
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-    protected sortFilesPipe:SortFilesPipe,
-    protected readonly storageFilesResourceService:StorageFilesResourceService,
-    private readonly i18n:I18nService,
-    private readonly timezoneService:TimezoneService,
-  ) {
-    super(
-      locals,
-      elementRef,
-      cdRef,
-      sortFilesPipe,
-      storageFilesResourceService,
-    );
-  }
-
   public chooseLocation():void {
     this.submitted = true;
     this.service.close();
diff --git a/frontend/src/app/shared/components/storages/storage-information/storage-information.service.ts b/frontend/src/app/shared/components/storages/storage-information/storage-information.service.ts
index d0b521a1d80..c1513f2a880 100644
--- a/frontend/src/app/shared/components/storages/storage-information/storage-information.service.ts
+++ b/frontend/src/app/shared/components/storages/storage-information/storage-information.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -46,6 +46,9 @@ import {
 
 @Injectable()
 export class StorageInformationService {
+  private readonly i18n = inject(I18nService);
+  private readonly currentUserService = inject(CurrentUserService);
+
   private text = {
     fileLinkErrorHeader: this.i18n.t('js.storages.information.live_data_error'),
     fileLinkErrorContent: (storageType:string):string => this.i18n.t('js.storages.information.live_data_error_description', { storageType }),
@@ -60,11 +63,6 @@ export class StorageInformationService {
     suggestRelink: this.i18n.t('js.storages.information.suggest_relink'),
   };
 
-  constructor(
-    private readonly i18n:I18nService,
-    private readonly currentUserService:CurrentUserService,
-  ) {}
-
   public storageInformation(storage:IStorage, fileLinks:IFileLink[]):Observable<StorageInformationBox[]> {
     return this.currentUserService.isLoggedIn$
       .pipe(
diff --git a/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.ts b/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.ts
index 03aecc7be53..65abde2e571 100644
--- a/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.ts
+++ b/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, inject } from '@angular/core';
 import { CookieService } from 'ngx-cookie-service';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -43,15 +43,15 @@ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-in
   standalone: false,
 })
 export class StorageLoginButtonComponent implements OnInit {
+  elementRef = inject(ElementRef);
+  private readonly i18n = inject(I18nService);
+  private readonly cookieService = inject(CookieService);
+
   @Input() input:IStorageLoginInput;
 
   label:string;
 
-  constructor(
-    public elementRef:ElementRef,
-    private readonly i18n:I18nService,
-    private readonly cookieService:CookieService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/shared/components/storages/storage/storage.component.ts b/frontend/src/app/shared/components/storages/storage/storage.component.ts
index 40d47240737..1d5b29e17c0 100644
--- a/frontend/src/app/shared/components/storages/storage/storage.component.ts
+++ b/frontend/src/app/shared/components/storages/storage/storage.component.ts
@@ -26,18 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild, inject } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import {
   combineLatest,
@@ -113,6 +102,18 @@ import {
   standalone: false,
 })
 export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
+  private readonly i18n = inject(I18nService);
+  private readonly cdRef = inject(ChangeDetectorRef);
+  private readonly toastService = inject(ToastService);
+  private readonly uploadService = inject(OpUploadService);
+  private readonly opModalService = inject(OpModalService);
+  private readonly timezoneService = inject(TimezoneService);
+  private readonly pathHelperService = inject(PathHelperService);
+  private readonly storagesResourceService = inject(StoragesResourceService);
+  private readonly fileLinkResourceService = inject(FileLinksResourceService);
+  private readonly storageInformationService = inject(StorageInformationService);
+  private readonly storageFilesResourceService = inject(StorageFilesResourceService);
+
   @Input() public resource:HalResource;
 
   @Input() public projectStorage:IProjectStorage;
@@ -218,22 +219,6 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnD
     return this.projectStorage._links.open?.href;
   }
 
-  constructor(
-    private readonly i18n:I18nService,
-    private readonly cdRef:ChangeDetectorRef,
-    private readonly toastService:ToastService,
-    private readonly uploadService:OpUploadService,
-    private readonly opModalService:OpModalService,
-    private readonly timezoneService:TimezoneService,
-    private readonly pathHelperService:PathHelperService,
-    private readonly storagesResourceService:StoragesResourceService,
-    private readonly fileLinkResourceService:FileLinksResourceService,
-    private readonly storageInformationService:StorageInformationService,
-    private readonly storageFilesResourceService:StorageFilesResourceService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     this.storage = this.storagesResourceService.requireEntity(this.projectStorage._links.storage.href);
 
diff --git a/frontend/src/app/shared/components/storages/upload-conflict-modal/upload-conflict-modal.component.ts b/frontend/src/app/shared/components/storages/upload-conflict-modal/upload-conflict-modal.component.ts
index ae7d1082c1e..c319da37f5a 100644
--- a/frontend/src/app/shared/components/storages/upload-conflict-modal/upload-conflict-modal.component.ts
+++ b/frontend/src/app/shared/components/storages/upload-conflict-modal/upload-conflict-modal.component.ts
@@ -26,18 +26,10 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Inject,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 
 @Component({
   templateUrl: 'upload-conflict-modal.component.html',
@@ -45,6 +37,8 @@ import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.servi
   standalone: false,
 })
 export class UploadConflictModalComponent extends OpModalComponent {
+  private readonly i18n = inject(I18nService);
+
   public overwrite:boolean|null = null;
 
   public text = {
@@ -57,15 +51,6 @@ export class UploadConflictModalComponent extends OpModalComponent {
     },
   };
 
-  public constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly elementRef:ElementRef,
-    private readonly i18n:I18nService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   public close(overwrite:boolean):void {
     this.overwrite = overwrite;
     this.service.close();
diff --git a/frontend/src/app/shared/components/storages/upload/storage-upload.service.ts b/frontend/src/app/shared/components/storages/upload/storage-upload.service.ts
index 13920ff44e9..c4c0dd64808 100644
--- a/frontend/src/app/shared/components/storages/upload/storage-upload.service.ts
+++ b/frontend/src/app/shared/components/storages/upload/storage-upload.service.ts
@@ -28,7 +28,7 @@
 
 import { Observable } from 'rxjs';
 import { ID } from '@datorama/akita';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HttpClient, HttpEvent } from '@angular/common/http';
 
 import { IUploadFile, OpUploadService } from 'core-app/core/upload/upload.service';
@@ -47,13 +47,9 @@ export interface IStorageFileUploadResponse {
 
 @Injectable()
 export class StorageUploadService extends OpUploadService {
-  private uploadStrategy:IUploadStrategy;
+  private readonly http = inject(HttpClient);
 
-  constructor(
-    private readonly http:HttpClient,
-  ) {
-    super();
-  }
+  private uploadStrategy:IUploadStrategy;
 
   public upload<T>(
     href:string,
diff --git a/frontend/src/app/shared/components/table-pagination/pagination-service.ts b/frontend/src/app/shared/components/table-pagination/pagination-service.ts
index c9e80fb9932..f6463e1fe48 100644
--- a/frontend/src/app/shared/components/table-pagination/pagination-service.ts
+++ b/frontend/src/app/shared/components/table-pagination/pagination-service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 
 export const DEFAULT_PAGINATION_OPTIONS = {
@@ -48,9 +48,11 @@ export interface PaginationObject {
 
 @Injectable()
 export class PaginationService {
+  private configuration = inject(ConfigurationService);
+
   private paginationOptions:IPaginationOptions;
 
-  constructor(private configuration:ConfigurationService) {
+  constructor() {
     this.loadPaginationOptions();
   }
 
diff --git a/frontend/src/app/shared/components/table-pagination/table-pagination.component.ts b/frontend/src/app/shared/components/table-pagination/table-pagination.component.ts
index 838e27dd569..5ce33d98d56 100644
--- a/frontend/src/app/shared/components/table-pagination/table-pagination.component.ts
+++ b/frontend/src/app/shared/components/table-pagination/table-pagination.component.ts
@@ -26,15 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { PaginationInstance } from 'core-app/shared/components/table-pagination/pagination-instance';
@@ -47,6 +39,10 @@ import { PaginationService } from 'core-app/shared/components/table-pagination/p
   standalone: false,
 })
 export class TablePaginationComponent extends UntilDestroyedMixin implements OnInit {
+  protected paginationService = inject(PaginationService);
+  protected cdRef = inject(ChangeDetectorRef);
+  protected I18n = inject(I18nService);
+
   @Input() totalEntries:string;
 
   @Input() hideForSinglePageResults = false;
@@ -83,14 +79,6 @@ export class TablePaginationComponent extends UntilDestroyedMixin implements OnI
 
   public perPageOptions:number[] = [];
 
-  constructor(
-    protected paginationService:PaginationService,
-    protected cdRef:ChangeDetectorRef,
-    protected I18n:I18nService,
-  ) {
-    super();
-  }
-
   ngOnInit():void {
     const paginationOptions = this.paginationService.getPaginationOptions();
     this.perPageOptions = paginationOptions.perPageOptions;
diff --git a/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.ts b/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.ts
index b86417fe0aa..66d81fc4360 100644
--- a/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.ts
+++ b/frontend/src/app/shared/components/tabs/scrollable-tabs/scrollable-tabs.component.ts
@@ -1,17 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  Injector,
-  OnChanges,
-  Output,
-  SimpleChanges,
-  ViewChild,
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, Injector, OnChanges, Output, SimpleChanges, ViewChild, inject } from '@angular/core';
 import { TabDefinition } from 'core-app/shared/components/tabs/tab.interface';
 import {
   RawParams,
@@ -31,6 +18,10 @@ import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decora
   standalone: false,
 })
 export class ScrollableTabsComponent extends UntilDestroyedMixin implements AfterViewInit, OnChanges {
+  protected readonly $state = inject(StateService);
+  private cdRef = inject(ChangeDetectorRef);
+  injector = inject(Injector);
+
   @ViewChild('scrollContainer', { static: true }) scrollContainer:ElementRef;
 
   @ViewChild('scrollPane', { static: true }) scrollPane:ElementRef;
@@ -65,14 +56,6 @@ export class ScrollableTabsComponent extends UntilDestroyedMixin implements Afte
 
   private dragTargetStack = 0;
 
-  constructor(
-    protected readonly $state:StateService,
-    private cdRef:ChangeDetectorRef,
-    public injector:Injector,
-  ) {
-    super();
-  }
-
   ngAfterViewInit():void {
     this.container = this.scrollContainer.nativeElement as HTMLElement;
     this.pane = this.scrollPane.nativeElement as HTMLElement;
diff --git a/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts b/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts
index 90fb7116b2b..4fc79783b3c 100644
--- a/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts
+++ b/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector, inject } from '@angular/core';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
@@ -34,6 +34,8 @@ import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service
   standalone: false,
 })
 export class TriggerActionsEntryComponent {
+  readonly injector = inject(Injector);
+
   @InjectField() readonly apiv3Service:ApiV3Service;
 
   @InjectField() readonly toastService:ToastService;
@@ -55,9 +57,6 @@ export class TriggerActionsEntryComponent {
     areYouSure: this.i18n.t('js.text_are_you_sure'),
   };
 
-  constructor(readonly injector:Injector) {
-  }
-
   editTimeEntry() {
     void this.loadEntry().subscribe((entry:TimeEntryResource) => {
       document.addEventListener('dialog:close', (event:CustomEvent) => {
diff --git a/frontend/src/app/shared/components/time_entries/timer/stop-existing-timer-modal.component.ts b/frontend/src/app/shared/components/time_entries/timer/stop-existing-timer-modal.component.ts
index 4e723268c25..12d3d60454c 100644
--- a/frontend/src/app/shared/components/time_entries/timer/stop-existing-timer-modal.component.ts
+++ b/frontend/src/app/shared/components/time_entries/timer/stop-existing-timer-modal.component.ts
@@ -26,19 +26,8 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Inject,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ChangeDetectionStrategy, Component, HostBinding, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource';
 import {
   Observable,
@@ -59,6 +48,9 @@ import { StateService } from '@uirouter/core';
   standalone: false,
 })
 export class StopExistingTimerModalComponent extends OpModalComponent implements OnInit {
+  readonly state = inject(StateService);
+  readonly I18n = inject(I18nService);
+
   @HostBinding('class.op-timer-stop-modal') className = true;
 
   public active:TimeEntryResource;
@@ -80,16 +72,6 @@ export class StopExistingTimerModalComponent extends OpModalComponent implements
     tracking_time: this.I18n.t('js.timer.tracking_time'),
   };
 
-  constructor(
-    readonly elementRef:ElementRef,
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    readonly cdRef:ChangeDetectorRef,
-    readonly state:StateService,
-    readonly I18n:I18nService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit() {
     super.ngOnInit();
     this.active = this.locals.timer as TimeEntryResource;
diff --git a/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts b/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts
index 29e3e6df8eb..86a9dd959cf 100644
--- a/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts
+++ b/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts
@@ -1,13 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  Injector,
-  OnInit,
-  ViewEncapsulation,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Injector, OnInit, ViewEncapsulation, inject } from '@angular/core';
 import { TimeEntryTimerService } from 'core-app/shared/components/time_entries/services/time-entry-timer.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource';
@@ -31,6 +22,13 @@ export const timerAccountSelector = 'op-timer-account-menu';
   standalone: false,
 })
 export class TimerAccountMenuComponent extends UntilDestroyedMixin implements OnInit {
+  readonly injector = inject(Injector);
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  readonly timeEntryService = inject(TimeEntryTimerService);
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly I18n = inject(I18nService);
+  readonly toastService = inject(ToastService);
+
   @HostBinding('class.op-timer-account-menu') className = true;
   @InjectField() PathHelper:PathHelperService;
   @InjectField() TurboRequests:TurboRequestsService;
@@ -50,17 +48,6 @@ export class TimerAccountMenuComponent extends UntilDestroyedMixin implements On
     timer_already_stopped: this.I18n.t('js.timer.timer_already_stopped'),
   };
 
-  constructor(
-    readonly injector:Injector,
-    readonly elementRef:ElementRef<HTMLElement>,
-    readonly timeEntryService:TimeEntryTimerService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly I18n:I18nService,
-    readonly toastService:ToastService,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     const parent = this.elementRef.nativeElement.parentElement!;
     parent.hidden = true;
diff --git a/frontend/src/app/shared/components/toaster/toast.component.ts b/frontend/src/app/shared/components/toaster/toast.component.ts
index 0d6748304fb..30924c5e4c5 100644
--- a/frontend/src/app/shared/components/toaster/toast.component.ts
+++ b/frontend/src/app/shared/components/toaster/toast.component.ts
@@ -26,12 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import {
   BehaviorSubject,
   Observable,
@@ -52,6 +47,9 @@ import { IToast, ToastService, ToastType } from 'core-app/shared/components/toas
   standalone: false,
 })
 export class ToastComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly toastService = inject(ToastService);
+
   @Input() public toast:IToast;
 
   public text = {
@@ -72,12 +70,6 @@ export class ToastComponent implements OnInit {
 
   public loading$ = new BehaviorSubject<boolean>(false);
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly toastService:ToastService,
-  ) {
-  }
-
   ngOnInit():void {
     this.type = this.toast.type;
     this.icon = this.toast.icon ? `toast-icon icon-${this.toast.icon}` : '';
diff --git a/frontend/src/app/shared/components/toaster/toast.service.ts b/frontend/src/app/shared/components/toaster/toast.service.ts
index c1e6192c713..2acf4fd6388 100644
--- a/frontend/src/app/shared/components/toaster/toast.service.ts
+++ b/frontend/src/app/shared/components/toaster/toast.service.ts
@@ -29,7 +29,7 @@
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { input, State } from '@openproject/reactivestates';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HttpErrorResponse, HttpEvent } from '@angular/common/http';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -54,13 +54,13 @@ export interface IToast {
 
 @Injectable({ providedIn: 'root' })
 export class ToastService {
+  readonly configurationService = inject(ConfigurationService);
+  readonly I18n = inject(I18nService);
+
   // The current stack of toasters
   private stack = input<IToast[]>([]);
 
-  constructor(
-    readonly configurationService:ConfigurationService,
-    readonly I18n:I18nService,
-  ) {
+  constructor() {
     window.addEventListener(OPToastEvent, ({ detail:toast }:CustomEvent<IToast>) => {
       this.add(toast);
     });
diff --git a/frontend/src/app/shared/components/toaster/toasts-container.component.ts b/frontend/src/app/shared/components/toaster/toasts-container.component.ts
index 38d91529191..d8d1a459082 100644
--- a/frontend/src/app/shared/components/toaster/toasts-container.component.ts
+++ b/frontend/src/app/shared/components/toaster/toasts-container.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 import { IToast, ToastService } from './toast.service';
 
@@ -46,14 +46,10 @@ import { IToast, ToastService } from './toast.service';
   standalone: false,
 })
 export class ToastsContainerComponent extends UntilDestroyedMixin implements OnInit {
-  public stack:IToast[] = [];
+  readonly toastService = inject(ToastService);
+  readonly cdRef = inject(ChangeDetectorRef);
 
-  constructor(
-    readonly toastService:ToastService,
-    readonly cdRef:ChangeDetectorRef,
-  ) {
-    super();
-  }
+  public stack:IToast[] = [];
 
   ngOnInit():void {
     this.toastService
diff --git a/frontend/src/app/shared/components/user-link/user-link.component.ts b/frontend/src/app/shared/components/user-link/user-link.component.ts
index e8b5e83576a..611989dcfd3 100644
--- a/frontend/src/app/shared/components/user-link/user-link.component.ts
+++ b/frontend/src/app/shared/components/user-link/user-link.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core';
 import { UserResource } from 'core-app/features/hal/resources/user-resource';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
@@ -51,10 +51,10 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class UserLinkComponent {
-  @Input() user:UserResource;
+  readonly I18n = inject(I18nService);
+  readonly pathHelperService = inject(PathHelperService);
 
-  constructor(readonly I18n:I18nService, readonly pathHelperService:PathHelperService) {
-  }
+  @Input() user:UserResource;
 
   public get href() {
     return this.user && this.user.showUserPath;
diff --git a/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/filters-tab-inner.component.ts b/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/filters-tab-inner.component.ts
index 14e2c569689..71b46953c8d 100644
--- a/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/filters-tab-inner.component.ts
+++ b/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/filters-tab-inner.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
 import { WorkPackageViewFiltersService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
@@ -18,19 +18,29 @@ import { WorkPackageFiltersService } from 'core-app/features/work-packages/compo
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpGraphConfigurationFiltersTabInnerComponent extends QuerySpacedTabComponent implements TabComponent, OnInit {
+  readonly I18n:I18nService;
+  readonly wpTableFilters = inject(WorkPackageViewFiltersService);
+  readonly wpFiltersService = inject(WorkPackageFiltersService);
+  readonly wpStatesInitialization:WorkPackageStatesInitializationService;
+  readonly wpGraphConfiguration:WpGraphConfigurationService;
+  private cdRef = inject(ChangeDetectorRef);
+
   public filters:QueryFilterInstanceResource[] = [];
 
   public text = {
     multiSelectLabel: this.I18n.t('js.work_packages.label_column_multiselect'),
   };
 
-  constructor(readonly I18n:I18nService,
-    readonly wpTableFilters:WorkPackageViewFiltersService,
-    readonly wpFiltersService:WorkPackageFiltersService,
-    readonly wpStatesInitialization:WorkPackageStatesInitializationService,
-    readonly wpGraphConfiguration:WpGraphConfigurationService,
-    private cdRef:ChangeDetectorRef) {
+  constructor() {
+    const I18n = inject(I18nService);
+    const wpStatesInitialization = inject(WorkPackageStatesInitializationService);
+    const wpGraphConfiguration = inject(WpGraphConfigurationService);
+
     super(I18n, wpStatesInitialization, wpGraphConfiguration);
+
+    this.I18n = I18n;
+    this.wpStatesInitialization = wpStatesInitialization;
+    this.wpGraphConfiguration = wpGraphConfiguration;
   }
 
   ngOnInit() {
diff --git a/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/settings-tab-inner.component.ts b/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/settings-tab-inner.component.ts
index baffe7b4c01..c16f66b8c0e 100644
--- a/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/settings-tab-inner.component.ts
+++ b/frontend/src/app/shared/components/work-package-graphs/configuration-modal/tabs/settings-tab-inner.component.ts
@@ -1,6 +1,6 @@
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WorkPackageViewGroupByService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-group-by.service';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject } from '@angular/core';
 import { WpGraphConfigurationService } from 'core-app/shared/components/work-package-graphs/configuration/wp-graph-configuration.service';
 import { WorkPackageStatesInitializationService } from 'core-app/features/work-packages/components/wp-list/wp-states-initialization.service';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
@@ -23,6 +23,12 @@ interface OpChartType {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WpGraphConfigurationSettingsTabInnerComponent extends QuerySpacedTabComponent implements TabComponent, OnInit {
+  readonly I18n:I18nService;
+  readonly wpTableGroupBy = inject(WorkPackageViewGroupByService);
+  readonly wpStatesInitialization:WorkPackageStatesInitializationService;
+  readonly wpGraphConfiguration:WpGraphConfigurationService;
+  private cdRef = inject(ChangeDetectorRef);
+
   // Grouping
   public availableGroups:QueryGroupByResource[] = [];
 
@@ -35,12 +41,16 @@ export class WpGraphConfigurationSettingsTabInnerComponent extends QuerySpacedTa
     chart_type: this.I18n.t('js.chart.type'),
   };
 
-  constructor(readonly I18n:I18nService,
-    readonly wpTableGroupBy:WorkPackageViewGroupByService,
-    readonly wpStatesInitialization:WorkPackageStatesInitializationService,
-    readonly wpGraphConfiguration:WpGraphConfigurationService,
-    private cdRef:ChangeDetectorRef) {
+  constructor() {
+    const I18n = inject(I18nService);
+    const wpStatesInitialization = inject(WorkPackageStatesInitializationService);
+    const wpGraphConfiguration = inject(WpGraphConfigurationService);
+
     super(I18n, wpStatesInitialization, wpGraphConfiguration);
+
+    this.I18n = I18n;
+    this.wpStatesInitialization = wpStatesInitialization;
+    this.wpGraphConfiguration = wpGraphConfiguration;
   }
 
   public onSave() {
diff --git a/frontend/src/app/shared/components/work-package-graphs/configuration-modal/wp-graph-configuration.modal.ts b/frontend/src/app/shared/components/work-package-graphs/configuration-modal/wp-graph-configuration.modal.ts
index d7b4b9d6ad8..bdbbe1f1c62 100644
--- a/frontend/src/app/shared/components/work-package-graphs/configuration-modal/wp-graph-configuration.modal.ts
+++ b/frontend/src/app/shared/components/work-package-graphs/configuration-modal/wp-graph-configuration.modal.ts
@@ -1,21 +1,5 @@
-import {
-  ApplicationRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ComponentFactoryResolver,
-  ElementRef,
-  Inject,
-  InjectionToken,
-  Injector,
-  OnDestroy,
-  OnInit,
-  Optional,
-  ViewChild,
-} from '@angular/core';
-import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { ApplicationRef, ChangeDetectionStrategy, Component, ComponentFactoryResolver, ElementRef, InjectionToken, Injector, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
 import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
-import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
 import {
   ActiveTabInterface,
@@ -38,7 +22,15 @@ export const WpTableConfigurationModalPrependToken = new InjectionToken<Componen
   standalone: false,
 })
 export class WpGraphConfigurationModalComponent extends OpModalComponent implements OnInit, OnDestroy {
-  public element:HTMLElement;
+  prependModalComponent = inject<ComponentType<unknown> | null>(WpTableConfigurationModalPrependToken, { optional: true });
+  readonly I18n = inject(I18nService);
+  readonly injector = inject(Injector);
+  readonly appRef = inject(ApplicationRef);
+  readonly componentFactoryResolver = inject(ComponentFactoryResolver);
+  readonly loadingIndicator = inject(LoadingIndicatorService);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly configurationService = inject(ConfigurationService);
+  readonly graphConfiguration = inject(WpGraphConfigurationService);
 
   public text = {
     title: this.I18n.t('js.chart.modal_title'),
@@ -56,23 +48,6 @@ export class WpGraphConfigurationModalComponent extends OpModalComponent impleme
   // And a reference to the actual portal host interface
   public tabPortalHost:TabPortalOutlet;
 
-  constructor(
-    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
-    @Optional() @Inject(WpTableConfigurationModalPrependToken) public prependModalComponent:ComponentType<any>|null,
-    readonly I18n:I18nService,
-    readonly injector:Injector,
-    readonly appRef:ApplicationRef,
-    readonly componentFactoryResolver:ComponentFactoryResolver,
-    readonly loadingIndicator:LoadingIndicatorService,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly cdRef:ChangeDetectorRef,
-    readonly configurationService:ConfigurationService,
-    readonly elementRef:ElementRef,
-    readonly graphConfiguration:WpGraphConfigurationService,
-  ) {
-    super(locals, cdRef, elementRef);
-  }
-
   ngOnInit():void {
     this.element = this.elementRef.nativeElement as HTMLElement;
 
diff --git a/frontend/src/app/shared/components/work-package-graphs/configuration/wp-graph-configuration.service.ts b/frontend/src/app/shared/components/work-package-graphs/configuration/wp-graph-configuration.service.ts
index fe2deda2b2c..728866c0660 100644
--- a/frontend/src/app/shared/components/work-package-graphs/configuration/wp-graph-configuration.service.ts
+++ b/frontend/src/app/shared/components/work-package-graphs/configuration/wp-graph-configuration.service.ts
@@ -2,7 +2,7 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { WpGraphConfigurationSettingsTabComponent } from 'core-app/shared/components/work-package-graphs/configuration-modal/tabs/settings-tab.component';
 import { QueryResource } from 'core-app/features/hal/resources/query-resource';
 import { TabInterface } from 'core-app/features/work-packages/components/wp-table/configuration-modal/tab-portal-outlet';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { WpGraphConfigurationFiltersTabComponent } from 'core-app/shared/components/work-package-graphs/configuration-modal/tabs/filters-tab.component';
 import { ChartOptions } from 'chart.js';
 import { QueryFormResource } from 'core-app/features/hal/resources/query-form-resource';
@@ -22,6 +22,11 @@ import {
 
 @Injectable()
 export class WpGraphConfigurationService {
+  readonly I18n = inject(I18nService);
+  readonly apiv3Service = inject(ApiV3Service);
+  readonly notificationService = inject(WorkPackageNotificationService);
+  readonly currentProject = inject(CurrentProjectService);
+
   private _configuration:WpGraphConfiguration;
 
   private _globalScope = false;
@@ -30,13 +35,6 @@ export class WpGraphConfigurationService {
 
   private _formsPromise:Promise<unknown>|null;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly apiv3Service:ApiV3Service,
-    readonly notificationService:WorkPackageNotificationService,
-    readonly currentProject:CurrentProjectService,
-  ) { }
-
   public persistAndReload():Promise<unknown> {
     return this
       .persistChanges()
diff --git a/frontend/src/app/shared/components/work-package-graphs/embedded/wp-embedded-graph.component.ts b/frontend/src/app/shared/components/work-package-graphs/embedded/wp-embedded-graph.component.ts
index 1361dd9e7fe..df65d4d7399 100644
--- a/frontend/src/app/shared/components/work-package-graphs/embedded/wp-embedded-graph.component.ts
+++ b/frontend/src/app/shared/components/work-package-graphs/embedded/wp-embedded-graph.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, SimpleChanges, OnChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, SimpleChanges, OnChanges, inject } from '@angular/core';
 import { WorkPackageTableConfiguration } from 'core-app/features/work-packages/components/wp-table/wp-table-configuration';
 import { ChartOptions } from 'chart.js';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -35,6 +35,8 @@ interface ChartDataSet {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class WorkPackageEmbeddedGraphComponent implements OnChanges {
+  readonly i18n = inject(I18nService);
+
   @Input() public datasets:WorkPackageEmbeddedGraphDataset[];
 
   @Input() public chartOptions:ChartOptions;
@@ -59,8 +61,6 @@ export class WorkPackageEmbeddedGraphComponent implements OnChanges {
     noResults: this.i18n.t('js.work_packages.no_results.title'),
   };
 
-  constructor(readonly i18n:I18nService) {}
-
   ngOnChanges(changes:SimpleChanges) {
     if (changes.datasets) {
       this.setChartOptions();
diff --git a/frontend/src/app/shared/components/work-package-graphs/overview/wp-overview-graph.component.ts b/frontend/src/app/shared/components/work-package-graphs/overview/wp-overview-graph.component.ts
index 0147697aa8d..593632cf1f1 100644
--- a/frontend/src/app/shared/components/work-package-graphs/overview/wp-overview-graph.component.ts
+++ b/frontend/src/app/shared/components/work-package-graphs/overview/wp-overview-graph.component.ts
@@ -1,12 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Input,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild, inject } from '@angular/core';
 import {
   WorkPackageEmbeddedGraphComponent,
   WorkPackageEmbeddedGraphDataset,
@@ -33,6 +25,11 @@ import {
   standalone: false,
 })
 export class WorkPackageOverviewGraphComponent implements OnInit {
+  readonly elementRef = inject<ElementRef<Element>>(ElementRef);
+  readonly I18n = inject(I18nService);
+  readonly graphConfigurationService = inject(WpGraphConfigurationService);
+  protected readonly cdr = inject(ChangeDetectorRef);
+
   @Input() initialFilters:any;
 
   @Input() globalScope:boolean;
@@ -53,12 +50,9 @@ export class WorkPackageOverviewGraphComponent implements OnInit {
 
   public error:string|null = null;
 
-  constructor(
-    readonly elementRef:ElementRef<Element>,
-    readonly I18n:I18nService,
-    readonly graphConfigurationService:WpGraphConfigurationService,
-    protected readonly cdr:ChangeDetectorRef,
-  ) {
+  constructor() {
+    const I18n = this.I18n;
+
     this.availableGroupBy = [{ label: I18n.t('js.work_packages.properties.category'), key: 'category' },
       { label: I18n.t('js.work_packages.properties.type'), key: 'type' },
       { label: I18n.t('js.work_packages.properties.status'), key: 'status' },
diff --git a/frontend/src/app/shared/components/work-packages/alternative-search.service.ts b/frontend/src/app/shared/components/work-packages/alternative-search.service.ts
index feb4c7a877e..01ab8c7e670 100644
--- a/frontend/src/app/shared/components/work-packages/alternative-search.service.ts
+++ b/frontend/src/app/shared/components/work-packages/alternative-search.service.ts
@@ -1,12 +1,11 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { QueryFilterResource } from 'core-app/features/hal/resources/query-filter-resource';
 
 @Injectable({ providedIn: 'root' })
 export class AlternativeSearchService {
-  constructor(
-    readonly I18n:I18nService,
-  ) { }
+  readonly I18n = inject(I18nService);
+
 
   private specialSearchStrings = {
     percentComplete: this.I18n.t('js.work_packages.properties.percentComplete'),
diff --git a/frontend/src/app/shared/directives/a11y/keyboard-shortcut.service.ts b/frontend/src/app/shared/directives/a11y/keyboard-shortcut.service.ts
index 25018e69176..071c02d885d 100644
--- a/frontend/src/app/shared/directives/a11y/keyboard-shortcut.service.ts
+++ b/frontend/src/app/shared/directives/a11y/keyboard-shortcut.service.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { FocusHelperService } from 'core-app/shared/directives/focus/focus-helper';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@@ -51,6 +51,11 @@ const accessibleListSelector = 'table.keyboard-accessible-list';
   providedIn: 'root',
 })
 export class KeyboardShortcutService {
+  private readonly PathHelper = inject(PathHelperService);
+  private readonly FocusHelper = inject(FocusHelperService);
+  private readonly currentProject = inject(CurrentProjectService);
+  private readonly configurationService = inject(ConfigurationService);
+
   // maybe move it to a .constant
   private shortcuts:Record<string, () => void> = {
     '?': () => this.showHelpModal(),
@@ -73,13 +78,6 @@ export class KeyboardShortcutService {
     'j': () => this.focusNextItem(),
   };
 
-  constructor(
-    private readonly PathHelper:PathHelperService,
-    private readonly FocusHelper:FocusHelperService,
-    private readonly currentProject:CurrentProjectService,
-    private readonly configurationService:ConfigurationService,
-  ) {}
-
   /**
    * Register the keyboard shortcuts.
    */
diff --git a/frontend/src/app/shared/directives/focus/autofocus.directive.ts b/frontend/src/app/shared/directives/focus/autofocus.directive.ts
index 36d595d636f..16b37c04025 100644
--- a/frontend/src/app/shared/directives/focus/autofocus.directive.ts
+++ b/frontend/src/app/shared/directives/focus/autofocus.directive.ts
@@ -1,9 +1,4 @@
-import {
-  AfterViewInit,
-  Directive,
-  ElementRef,
-  Input,
-} from '@angular/core';
+import { AfterViewInit, Directive, ElementRef, Input, inject } from '@angular/core';
 import { FocusHelperService } from './focus-helper';
 
 @Directive({
@@ -11,12 +6,10 @@ import { FocusHelperService } from './focus-helper';
   standalone: false,
 })
 export class AutofocusDirective implements AfterViewInit {
-  @Input('opAutofocus') public condition:string|boolean = true;
+  readonly FocusHelper = inject(FocusHelperService);
+  readonly elementRef = inject(ElementRef);
 
-  constructor(
-    readonly FocusHelper:FocusHelperService,
-    readonly elementRef:ElementRef,
-  ) { }
+  @Input('opAutofocus') public condition:string|boolean = true;
 
   ngAfterViewInit():void {
     this.updateFocus();
diff --git a/frontend/src/app/shared/directives/focus/focus-within.directive.ts b/frontend/src/app/shared/directives/focus/focus-within.directive.ts
index 2e54670550b..286a38bb181 100644
--- a/frontend/src/app/shared/directives/focus/focus-within.directive.ts
+++ b/frontend/src/app/shared/directives/focus/focus-within.directive.ts
@@ -28,9 +28,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { auditTime } from 'rxjs/operators';
-import {
-  Directive, ElementRef, Input, OnInit,
-} from '@angular/core';
+import { Directive, ElementRef, Input, OnInit, inject } from '@angular/core';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 
 // with courtesy of http://stackoverflow.com/a/29722694/3206935
@@ -40,11 +38,9 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
   standalone: false,
 })
 export class FocusWithinDirective extends UntilDestroyedMixin implements OnInit {
-  @Input() public selector:string;
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
 
-  constructor(readonly elementRef:ElementRef<HTMLElement>) {
-    super();
-  }
+  @Input() public selector:string;
 
   ngOnInit() {
     const element = this.elementRef.nativeElement;
diff --git a/frontend/src/app/shared/directives/op-drag-scroll/op-drag-scroll.directive.ts b/frontend/src/app/shared/directives/op-drag-scroll/op-drag-scroll.directive.ts
index 49996b826f7..978d454a9ba 100644
--- a/frontend/src/app/shared/directives/op-drag-scroll/op-drag-scroll.directive.ts
+++ b/frontend/src/app/shared/directives/op-drag-scroll/op-drag-scroll.directive.ts
@@ -25,7 +25,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 //++
-import { Directive, ElementRef, OnInit } from '@angular/core';
+import { Directive, ElementRef, OnInit, inject } from '@angular/core';
 
 declare global {
   interface GlobalEventHandlersEventMap {
@@ -38,8 +38,8 @@ declare global {
   standalone: false,
 })
 export class OpDragScrollDirective implements OnInit {
-  constructor(readonly elementRef:ElementRef<HTMLElement>) {
-  }
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+
 
   ngOnInit() {
     const element = this.elementRef.nativeElement;
diff --git a/frontend/src/app/shared/directives/search-highlight.directive.ts b/frontend/src/app/shared/directives/search-highlight.directive.ts
index 8bfcffa3b0c..68280c727a4 100644
--- a/frontend/src/app/shared/directives/search-highlight.directive.ts
+++ b/frontend/src/app/shared/directives/search-highlight.directive.ts
@@ -1,18 +1,13 @@
-import {
-  AfterViewChecked,
-  Directive,
-  ElementRef,
-  Input,
-} from '@angular/core';
+import { AfterViewChecked, Directive, ElementRef, Input, inject } from '@angular/core';
 
 @Directive({
   selector: '[opSearchHighlight]',
   standalone: false,
 })
 export class OpSearchHighlightDirective implements AfterViewChecked {
-  @Input('opSearchHighlight') public query = '';
+  readonly elementRef = inject(ElementRef);
 
-  constructor(readonly elementRef:ElementRef) { }
+  @Input('opSearchHighlight') public query = '';
 
   ngAfterViewChecked():void {
     let el = this.elementRef.nativeElement as HTMLElement;
diff --git a/frontend/src/app/shared/helpers/drag-and-drop/drag-and-drop.service.ts b/frontend/src/app/shared/helpers/drag-and-drop/drag-and-drop.service.ts
index 21e60dba4b5..686d9606d9f 100644
--- a/frontend/src/app/shared/helpers/drag-and-drop/drag-and-drop.service.ts
+++ b/frontend/src/app/shared/helpers/drag-and-drop/drag-and-drop.service.ts
@@ -1,6 +1,4 @@
-import {
-  Inject, Injectable, Injector, OnDestroy, DOCUMENT
-} from '@angular/core';
+import { Injectable, Injector, OnDestroy, DOCUMENT, inject } from '@angular/core';
 import { DomAutoscrollService } from 'core-app/shared/helpers/drag-and-drop/dom-autoscroll.service';
 import { findIndex, reinsert } from 'core-app/shared/helpers/drag-and-drop/drag-and-drop.helpers';
 import dragula, { Drake } from 'dragula';
@@ -32,6 +30,9 @@ export interface DragMember {
 
 @Injectable()
 export class DragAndDropService implements OnDestroy {
+  private document = inject<Document>(DOCUMENT);
+  readonly injector = inject(Injector);
+
   public drake:Drake|null = null;
 
   public members:DragMember[] = [];
@@ -44,8 +45,7 @@ export class DragAndDropService implements OnDestroy {
     }
   };
 
-  constructor(@Inject(DOCUMENT) private document:Document,
-    readonly injector:Injector) {
+  constructor() {
     this.document.documentElement.addEventListener('keydown', this.escapeListener);
   }
 
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index e8059dc3077..0775f06eb3e 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 import { FormsModule } from '@angular/forms';
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { A11yModule } from '@angular/cdk/a11y';
 import { UIRouterGlobals } from '@uirouter/core';
 import { NgSelectModule } from '@ng-select/ng-select';
@@ -222,7 +222,9 @@ export function bootstrapModule(injector:Injector):void {
   ],
 })
 export class OpSharedModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     bootstrapModule(injector);
   }
 }
diff --git a/frontend/src/app/spot/components/checkbox/checkbox.component.ts b/frontend/src/app/spot/components/checkbox/checkbox.component.ts
index f27bcc6ddd0..7d9e44a5658 100644
--- a/frontend/src/app/spot/components/checkbox/checkbox.component.ts
+++ b/frontend/src/app/spot/components/checkbox/checkbox.component.ts
@@ -1,15 +1,4 @@
-import {
-  Component,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  HostBinding,
-  Input,
-  Output,
-  ViewChild,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-} from '@angular/core';
+import { Component, ElementRef, EventEmitter, forwardRef, HostBinding, Input, Output, ViewChild, ChangeDetectionStrategy, ChangeDetectorRef, inject } from '@angular/core';
 import {
   ControlValueAccessor,
   NG_VALUE_ACCESSOR,
@@ -29,6 +18,8 @@ export type SpotCheckboxState = true|false|null;
   standalone: false,
 })
 export class SpotCheckboxComponent implements ControlValueAccessor {
+  readonly cdRef = inject(ChangeDetectorRef);
+
   @HostBinding('class.spot-checkbox') public className = true;
 
   @ViewChild('input') public input:ElementRef;
@@ -61,10 +52,6 @@ export class SpotCheckboxComponent implements ControlValueAccessor {
    */
   @Output() checkedChange = new EventEmitter<boolean>();
 
-  constructor(
-    readonly cdRef:ChangeDetectorRef,
-  ) {}
-
   onStateChange():void {
     const value = (this.input.nativeElement as HTMLInputElement).checked;
     this.checkedChange.emit(value);
diff --git a/frontend/src/app/spot/components/drop-modal/drop-modal-portal.component.ts b/frontend/src/app/spot/components/drop-modal/drop-modal-portal.component.ts
index 1e1289370d8..354a23199c7 100644
--- a/frontend/src/app/spot/components/drop-modal/drop-modal-portal.component.ts
+++ b/frontend/src/app/spot/components/drop-modal/drop-modal-portal.component.ts
@@ -1,11 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, OnInit, inject } from '@angular/core';
 import { SpotDropModalTeleportationService, TeleportInstance } from './drop-modal-teleportation.service';
 import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
 
@@ -16,18 +9,14 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
   standalone: false,
 })
 export class SpotDropModalPortalComponent extends UntilDestroyedMixin implements OnInit {
+  readonly cdRef = inject(ChangeDetectorRef);
+  readonly template$ = inject(SpotDropModalTeleportationService);
+  readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+
   @HostBinding('class.spot-drop-modal-portal') className = true;
 
   template:TeleportInstance|null = null;
 
-  constructor(
-    readonly cdRef:ChangeDetectorRef,
-    readonly template$:SpotDropModalTeleportationService,
-    readonly elementRef:ElementRef<HTMLElement>,
-  ) {
-    super();
-  }
-
   ngOnInit() {
     this
       .template$
diff --git a/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts b/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts
index b2b3fa3f6bb..111d7155064 100644
--- a/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts
+++ b/frontend/src/app/spot/components/drop-modal/drop-modal.component.ts
@@ -1,16 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostBinding,
-  Input,
-  OnDestroy,
-  Output,
-  TemplateRef,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, Input, OnDestroy, Output, TemplateRef, ViewChild, inject } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { findAllFocusableElementsWithin } from 'core-app/shared/helpers/focus-helpers';
 import { SpotDropModalTeleportationService } from './drop-modal-teleportation.service';
@@ -25,6 +13,11 @@ import { autoUpdate, computePosition, flip, limitShift, Placement, shift } from
   standalone: false,
 })
 export class SpotDropModalComponent implements OnDestroy {
+  readonly i18n = inject(I18nService);
+  readonly elementRef = inject(ElementRef);
+  readonly cdRef = inject(ChangeDetectorRef);
+  private teleportationService = inject(SpotDropModalTeleportationService);
+
   @HostBinding('class.spot-drop-modal') public className = true;
 
   /**
@@ -99,13 +92,6 @@ export class SpotDropModalComponent implements OnDestroy {
 
   @ViewChild('focusGrabber') focusGrabber:ElementRef;
 
-  constructor(
-    readonly i18n:I18nService,
-    readonly elementRef:ElementRef,
-    readonly cdRef:ChangeDetectorRef,
-    private teleportationService:SpotDropModalTeleportationService,
-  ) {}
-
   open() {
     this._opened = true;
     this.updateAppHeight();
diff --git a/frontend/src/app/spot/components/form-field/form-field.component.ts b/frontend/src/app/spot/components/form-field/form-field.component.ts
index 03bbd08d373..92bcbcb1eec 100644
--- a/frontend/src/app/spot/components/form-field/form-field.component.ts
+++ b/frontend/src/app/spot/components/form-field/form-field.component.ts
@@ -1,6 +1,4 @@
-import {
-  ChangeDetectionStrategy, Component, ContentChild, HostBinding, Input, Optional,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ContentChild, HostBinding, Input, inject } from '@angular/core';
 import { AbstractControl, FormGroupDirective, NgControl } from '@angular/forms';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -14,6 +12,9 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class SpotFormFieldComponent {
+  private _formGroupDirective = inject(FormGroupDirective, { optional: true });
+  readonly I18n = inject(I18nService);
+
   @HostBinding('class.spot-form-field') className = true;
 
   @HostBinding('class.spot-form-field_invalid') get errorClassName():boolean {
@@ -93,7 +94,7 @@ export class SpotFormFieldComponent {
     }
 
     if (this.showValidationErrorOn === 'submit') {
-      return this.formControl.invalid && this._formGroupDirective?.submitted;
+      return this.formControl.invalid && (this._formGroupDirective?.submitted ?? false);
     } if (this.showValidationErrorOn === 'blur') {
       return this.formControl.invalid && this.formControl.touched;
     } if (this.showValidationErrorOn === 'change') {
@@ -102,9 +103,4 @@ export class SpotFormFieldComponent {
 
     return false;
   }
-
-  constructor(
-    @Optional() private _formGroupDirective:FormGroupDirective,
-    readonly I18n:I18nService,
-  ) {}
 }
diff --git a/frontend/src/app/spot/components/selector-field/selector-field.component.ts b/frontend/src/app/spot/components/selector-field/selector-field.component.ts
index 4c5346ebd2b..0db7cac2588 100644
--- a/frontend/src/app/spot/components/selector-field/selector-field.component.ts
+++ b/frontend/src/app/spot/components/selector-field/selector-field.component.ts
@@ -1,11 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ContentChild,
-  HostBinding,
-  Input,
-  Optional,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, ContentChild, HostBinding, Input, inject } from '@angular/core';
 import {
   AbstractControl,
   FormGroupDirective,
@@ -22,6 +15,8 @@ import {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class SpotSelectorFieldComponent {
+  private formGroupDirective = inject(FormGroupDirective, { optional: true });
+
   @HostBinding('class.spot-form-field') className = true;
 
   @HostBinding('class.spot-selector-field') classNameCheckbox = true;
@@ -96,7 +91,7 @@ export class SpotSelectorFieldComponent {
     }
 
     if (this.showValidationErrorOn === 'submit') {
-      return this.formControl.invalid && this.formGroupDirective?.submitted;
+      return this.formControl.invalid && (this.formGroupDirective?.submitted ?? false);
     }
     if (this.showValidationErrorOn === 'blur') {
       return this.formControl.invalid && this.formControl.touched;
@@ -107,8 +102,4 @@ export class SpotSelectorFieldComponent {
 
     return false;
   }
-
-  constructor(
-    @Optional() private formGroupDirective:FormGroupDirective,
-  ) {}
 }
diff --git a/frontend/src/app/spot/components/switch/switch.component.ts b/frontend/src/app/spot/components/switch/switch.component.ts
index 87e98e8e9c8..4a66ba3bc16 100644
--- a/frontend/src/app/spot/components/switch/switch.component.ts
+++ b/frontend/src/app/spot/components/switch/switch.component.ts
@@ -1,15 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  forwardRef,
-  HostBinding,
-  Input,
-  Output,
-  ViewChild,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, HostBinding, Input, Output, ViewChild, inject } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 
@@ -28,6 +17,9 @@ export type SpotSwitchState = boolean;
   standalone: false,
 })
 export class SpotSwitchComponent implements ControlValueAccessor {
+  elementRef = inject(ElementRef);
+  cdRef = inject(ChangeDetectorRef);
+
   @HostBinding('class.spot-switch') public className = true;
 
   @ViewChild('input') public input:ElementRef;
@@ -60,10 +52,7 @@ export class SpotSwitchComponent implements ControlValueAccessor {
    */
   @Output() checkedChange = new EventEmitter<boolean>();
 
-  constructor(
-    public elementRef:ElementRef,
-    public cdRef:ChangeDetectorRef,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/frontend/src/app/spot/components/text-field/text-field.component.ts b/frontend/src/app/spot/components/text-field/text-field.component.ts
index 1b28eb903f2..fa5002e3257 100644
--- a/frontend/src/app/spot/components/text-field/text-field.component.ts
+++ b/frontend/src/app/spot/components/text-field/text-field.component.ts
@@ -1,16 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostBinding,
-  HostListener,
-  Input,
-  Output,
-  ViewChild,
-  forwardRef,
-} from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, Output, ViewChild, forwardRef, inject } from '@angular/core';
 import {
   ControlValueAccessor,
   NG_VALUE_ACCESSOR,
@@ -31,6 +19,8 @@ import {
   changeDetection: ChangeDetectionStrategy.Default,
 })
 export class SpotTextFieldComponent implements ControlValueAccessor {
+  private cdRef = inject(ChangeDetectorRef);
+
   @HostBinding('class.spot-text-field') public className = true;
 
   @HostBinding('class.spot-text-field_focused') public focused = false;
@@ -99,10 +89,6 @@ export class SpotTextFieldComponent implements ControlValueAccessor {
 
   @Output() public inputBlur = new EventEmitter<FocusEvent>();
 
-  constructor(
-    private cdRef:ChangeDetectorRef,
-  ) {}
-
   onInputFocus(event:FocusEvent):void {
     this.focused = true;
     this.cdRef.markForCheck();
diff --git a/frontend/src/app/spot/components/toggle/toggle.component.ts b/frontend/src/app/spot/components/toggle/toggle.component.ts
index 673738c6b2e..051e954ceca 100644
--- a/frontend/src/app/spot/components/toggle/toggle.component.ts
+++ b/frontend/src/app/spot/components/toggle/toggle.component.ts
@@ -1,13 +1,4 @@
-import {
-  ChangeDetectorRef,
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  forwardRef,
-  HostBinding,
-  Input,
-  Output,
-} from '@angular/core';
+import { ChangeDetectorRef, ChangeDetectionStrategy, Component, EventEmitter, forwardRef, HostBinding, Input, Output, inject } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 export interface SpotToggleOption<T> {
@@ -27,6 +18,8 @@ export interface SpotToggleOption<T> {
   standalone: false,
 })
 export class SpotToggleComponent<T> implements ControlValueAccessor {
+  private cdRef = inject(ChangeDetectorRef);
+
   // TODO: These old styles will need to be replaced
   @HostBinding('class.form--field-inline-buttons-container') public classNameOld = true;
 
@@ -70,10 +63,6 @@ export class SpotToggleComponent<T> implements ControlValueAccessor {
    */
   @Output() valueChange = new EventEmitter<T>();
 
-  constructor(
-    private cdRef:ChangeDetectorRef,
-  ) {}
-
   writeValue(value:T):void {
     this.value = value;
     this.cdRef.markForCheck();
diff --git a/frontend/src/global_styles/content/_table.sass b/frontend/src/global_styles/content/_table.sass
index f44c8a9fd39..989a7e2ffab 100644
--- a/frontend/src/global_styles/content/_table.sass
+++ b/frontend/src/global_styles/content/_table.sass
@@ -151,7 +151,7 @@ table.generic-table
 
     @media screen
       th[scope="row"]:not(.-no-ellipsis),
-      td:not(.-no-ellipsis)
+      td:not(.-no-ellipsis):not(.buttons)
         @include text-shortener
 
     .project td
diff --git a/frontend/src/global_styles/content/_types_form_configuration.sass b/frontend/src/global_styles/content/_types_form_configuration.sass
index 6dd541f9ae5..42a0a239f75 100644
--- a/frontend/src/global_styles/content/_types_form_configuration.sass
+++ b/frontend/src/global_styles/content/_types_form_configuration.sass
@@ -1,100 +1,83 @@
-.type-form-conf-group,
-#type-form-conf-inactive-group
-  border-radius: 2px
-  padding: 0px 3px 1px 3px
-  margin-bottom: 20px
+//-- copyright
+// OpenProject is an open source project management software.
+// Copyright (C) the OpenProject GmbH
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See COPYRIGHT and LICENSE files for more details.
+//++
 
-  .group-head
-    color: var(--fgColor-white)
-    padding: 7px 4px 8px 0px
-    text-transform: uppercase
-    .group-handle
-      cursor: -webkit-grab
-      cursor: grab
-      color: var(--fgColor-white)
-      font-size: 12px
-    op-group-edit-in-place
-      display: inline-block
-      .group-edit-in-place--input
-        color: var(--fgColor-white)
-    .delete-group
-      .Button-visual
-        color: var(--fgColor-white)
-  .attributes
-    min-height: 29px
+@import ../openproject/mixins
 
-.type-form-conf-group
-  background: var(--accent-color)
-  .group-name
-    border-color: var(--accent-color)
-    border-width: 1px
-    border-style: solid
-    &:hover
-      cursor: text
-      border-color: var(--borderColor-default)
-      background: var(--control-bgColor-activ)
+body:has(.type-form-configuration-page)
+  @include extended-content--bottom
 
-  &.-error
-    background: var(--content-form-error-color)
-    .group-name
-      border-color: var(--content-form-error-color)
-    .group-handle
-      color: var(--fgColor-white)
+  #content-body
+    display: flex
+    flex-direction: column
 
+.type-form-configuration-page
+  &--wrapper
+    height: 100%
+    overflow: hidden
 
-#type-form-conf-inactive-group
-  background: var(--fgColor-muted)
-  .visibility-check
-    visibility: hidden
-  .group-head
-    display: block
-  .advice
-    text-transform: initial
+  &--sidebar
+    border-top-left-radius: var(--borderRadius-medium)
+    border-top-right-radius: var(--borderRadius-medium)
 
-.type-form-conf-attribute
-  padding: 7px 7px 7px 0px
-  margin-bottom: 2px
+  &--sidebar,
+  &--main
+    @include styled-scroll-bar
+    min-height: 0
 
-  background: var(--type-form-conf-attribute--background)
+  &--inactive-list
+    list-style: none
+    margin: 0
+    padding: 0
 
-  border-top-left-radius: 2px
-  border-bottom-left-radius: 2px
-  border-top-right-radius: 2px
-  border-bottom-right-radius: 2px
-  .attribute-handle
-    cursor: -webkit-grab
-    cursor: grab
-    color: var(--body-font-color)
-    font-size: 12px
-  .delete-attribute:before
-    color: var(--body-font-color)
+    .ActionListItem-visual--leading
+      pointer-events: auto
 
-.attribute-cf-label
-  font-size: 0.8rem
-  padding-left: 2px
-  color: #4d4d4d
+  &--inactive-item,
+  &--inactive-empty
+    margin-block: var(--base-size-4)
 
-#type-form-conf-group-template,
-#type-form-conf-query-template
-  display: none
+  &--inactive-item .ActionListContent
+    padding-inline: var(--base-size-4)
 
-.group-head,
-.type-form-conf-attribute
-  display: flex
-  align-items: baseline
-  justify-content: space-between
-  .icon-drag-handle
-    flex-basis: 15px
-  .attribute-name,
-  .group-name
-    flex-basis: 90%
-    @include text-shortener(false)
+  &--row-alignment-spacer
+    min-width: var(--base-size-16)
+    width: var(--base-size-16)
+    min-height: var(--control-small-size)
 
+  &--drag-handle,
+  &--actions
+    align-self: flex-start
+    justify-self: end
 
-// Query group styles
-.type-form-query
-  padding: 10px
-  cursor: pointer
-  color: white
+  &--actions-button
+    margin-top: 0
 
-// Ensure dropdown is shown
+  @media screen and (max-width: $breakpoint-md)
+    &--main-inner
+      padding-left: 0
+      padding-top: var(--base-size-24)
diff --git a/frontend/src/global_styles/content/modules/_backlogs.sass b/frontend/src/global_styles/content/modules/_backlogs.sass
index 81308edfc43..e46217e3da4 100644
--- a/frontend/src/global_styles/content/modules/_backlogs.sass
+++ b/frontend/src/global_styles/content/modules/_backlogs.sass
@@ -66,10 +66,12 @@
 
 //------------------ Sprint planning divider (side-by-side only) ----
 @container backlogsListsContainer (min-width: 655px)
-  .op-sprint-planning-lists:not(:last-child)
-    border-right: 1px solid var(--borderColor-default)
+  .op-sprint-planning-lists
     padding-right: var(--stack-gap-normal)
 
+    &:not(:last-child)
+      border-right: 1px solid var(--borderColor-default)
+
 //------------------ Mobile responsive styling -----------------------
 @container backlogsListsContainer (max-width: 654px)
   .op-sprint-planning-container
diff --git a/frontend/src/global_styles/openproject.sass b/frontend/src/global_styles/openproject.sass
index 0b6eb6746fb..2e2eeea80ab 100644
--- a/frontend/src/global_styles/openproject.sass
+++ b/frontend/src/global_styles/openproject.sass
@@ -20,6 +20,7 @@
 
 // Module specific Styles
 @import "../../../modules/auth_saml/app/components/_index.sass"
+@import "../../../modules/backlogs/app/components/_index.sass"
 @import "../../../modules/costs/app/components/_index.sass"
 @import "../../../modules/documents/app/assets/stylesheets/_index.sass"
 @import "../../../modules/documents/app/components/_index.sass"
diff --git a/frontend/src/global_styles/openproject/_variable_defaults.scss b/frontend/src/global_styles/openproject/_variable_defaults.scss
index 899d5c8ff18..e1cae8b034f 100644
--- a/frontend/src/global_styles/openproject/_variable_defaults.scss
+++ b/frontend/src/global_styles/openproject/_variable_defaults.scss
@@ -127,7 +127,6 @@
   --list-item-hover--border-color: transparent;
   --list-item-hover--color: var(--accent-color);
   --link-text-decoration: none;
-  --type-form-conf-attribute--background: var(--gray-light);
   --select-arrow-bg-color-url: url("data:image/svg+xml;utf8,<svg fill='black' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>");
   --split-screen-width: 550px;
   --full-view-split-right-width: 550px;
diff --git a/frontend/src/react/components/DocumentLoadingSkeleton.spec.ts b/frontend/src/react/components/DocumentLoadingSkeleton.spec.ts
new file mode 100644
index 00000000000..cc2761f87d5
--- /dev/null
+++ b/frontend/src/react/components/DocumentLoadingSkeleton.spec.ts
@@ -0,0 +1,47 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import { render } from '@testing-library/react';
+import { createElement } from 'react';
+import { DocumentLoadingSkeleton } from './DocumentLoadingSkeleton';
+
+describe('DocumentLoadingSkeleton', () => {
+  it('renders title and content skeleton boxes', () => {
+    const { container } = render(createElement(DocumentLoadingSkeleton));
+
+    const skeletons = Array.from(container.querySelectorAll<HTMLElement>('.SkeletonBox'));
+
+    expect(skeletons).toHaveLength(2);
+    expect(skeletons[0].style.width).toBe('25%');
+    expect(skeletons[0].style.height).toBe('40px');
+    expect(skeletons[1].style.width).toBe('100%');
+    expect(skeletons[1].style.height).toBe('150px');
+  });
+});
diff --git a/frontend/src/react/hooks/useBlockNoteLocale.spec.ts b/frontend/src/react/hooks/useBlockNoteLocale.spec.ts
new file mode 100644
index 00000000000..07b44d7733d
--- /dev/null
+++ b/frontend/src/react/hooks/useBlockNoteLocale.spec.ts
@@ -0,0 +1,50 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import { renderHook } from '@testing-library/react';
+import {
+  useBlockNoteLocale,
+} from './useBlockNoteLocale';
+
+describe('useBlockNoteLocale', () => {
+  it('returns a matching BlockNote locale when one exists', () => {
+    const { result } = renderHook(() => useBlockNoteLocale('de'));
+
+    expect(result.current.localeString).toBe('de');
+    expect(result.current.localeDictionary).toBeDefined();
+  });
+
+  it('falls back to English for unsupported locales', () => {
+    const { result } = renderHook(() => useBlockNoteLocale('xx-unsupported'));
+
+    expect(result.current.localeString).toBe('en');
+    expect(result.current.localeDictionary).toBeDefined();
+  });
+});
diff --git a/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/drag-and-drop.controller.ts b/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/drag-and-drop.controller.ts
new file mode 100644
index 00000000000..b997650e230
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/drag-and-drop.controller.ts
@@ -0,0 +1,64 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import GenericDragAndDropController from '../../generic-drag-and-drop.controller';
+
+export default class extends GenericDragAndDropController {
+  protected buildData(el:Element, target:Element):FormData {
+    const data = super.buildData(el, target);
+
+    if (!data.get('target_id')) {
+      const targetId = this.formConfigurationTargetId(target);
+      if (targetId) {
+        data.append('target_id', targetId);
+      }
+    }
+
+    return data;
+  }
+
+  async drop(el:Element, target:Element, source:Element|null, sibling:Element|null) {
+    if (this.element.querySelector('[data-edit-mode="true"]')) {
+      if (!window.confirm(I18n.t('js.text_are_you_sure_to_cancel'))) {
+        this.cancelDrag();
+        return;
+      }
+    }
+
+    await super.drop(el, target, source, sibling);
+  }
+
+  private formConfigurationTargetId(target:Element):string|null {
+    return target.closest<HTMLElement>('[data-group-key]')?.dataset.groupKey
+      ?? target.getAttribute('data-target-id')
+      ?? target.closest<HTMLElement>('[data-target-id]')?.getAttribute('data-target-id')
+      ?? null;
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/main.controller.ts b/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/main.controller.ts
new file mode 100644
index 00000000000..7c99c4c019e
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/main.controller.ts
@@ -0,0 +1,154 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import { Controller } from '@hotwired/stimulus';
+import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service';
+import {
+  ExternalRelationQueryConfigurationService,
+} from 'core-app/features/work-packages/components/wp-table/external-configuration/external-relation-query-configuration.service';
+
+export default class TypeFormConfigurationController extends Controller {
+  static targets = ['groupsContainer', 'inactiveContainer'];
+
+  declare readonly groupsContainerTarget:HTMLElement;
+  declare readonly inactiveContainerTarget:HTMLElement;
+
+  static values = {
+    addGroupUrl: String,
+    noFilterQuery: String,
+    groupsUrl: String,
+  };
+
+  declare readonly addGroupUrlValue:string;
+  declare readonly noFilterQueryValue:string;
+  declare readonly groupsUrlValue:string;
+
+  private turboRequests:TurboRequestsService;
+  private externalRelationQueryConfiguration:ExternalRelationQueryConfigurationService;
+  private servicesInitialization?:Promise<void>;
+
+  connect() {
+    this.servicesInitialization ??= this.initializeServices();
+  }
+
+  private async initializeServices() {
+    const context = await window.OpenProject.getPluginContext();
+    this.turboRequests = context.services.turboRequests;
+    this.externalRelationQueryConfiguration = context.services.externalRelationQueryConfiguration;
+  }
+
+  addQueryGroup(event:Event) {
+    event.preventDefault();
+
+    void this.openQueryEditor(this.noFilterQueryValue, (queryProps:unknown) => {
+      void this.postNewGroup('query', queryProps);
+    });
+  }
+
+  inactiveContainerTargetConnected() {
+    const filterListElement = this.element.querySelector<HTMLElement>('[data-controller~="filter--filter-list"]');
+    if (!filterListElement) return;
+
+    const filterListController = this.application.getControllerForElementAndIdentifier(filterListElement, 'filter--filter-list') as { filterLists:() => void }|null;
+    filterListController?.filterLists();
+  }
+
+  editQuery(event:Event) {
+    event.preventDefault();
+
+    const group = (event.currentTarget as HTMLElement).closest<HTMLElement>('[data-group-key]');
+    if (!group) return;
+
+    void this.openQueryEditor(group.dataset.groupQuery ?? this.noFilterQueryValue, (queryProps:unknown) => {
+      const key = group.dataset.groupKey;
+      if (!key) return;
+
+      void this.postQueryUpdate(key, queryProps).then((success) => {
+        if (success) {
+          group.dataset.groupQuery = JSON.stringify(queryProps);
+        }
+      });
+    });
+  }
+
+  private async postNewGroup(groupType:'attribute'|'query', queryProps?:unknown):Promise<void> {
+    await this.servicesInitialization;
+
+    const body = new URLSearchParams({
+      group_type: groupType,
+    });
+
+    if (queryProps) {
+      body.set('query', JSON.stringify(queryProps));
+    }
+
+    await this.turboRequests.request(this.addGroupUrlValue, {
+      method: 'POST',
+      headers: {
+        Accept: 'text/vnd.turbo-stream.html',
+      },
+      body,
+    });
+  }
+
+  private async postQueryUpdate(groupKey:string, queryProps:unknown):Promise<boolean> {
+    await this.servicesInitialization;
+
+    await this.turboRequests.request(`${this.groupsUrlValue}/${encodeURIComponent(groupKey)}/update_query`, {
+      method: 'PATCH',
+      headers: {
+        Accept: 'text/vnd.turbo-stream.html',
+      },
+      body: new URLSearchParams({
+        query: JSON.stringify(queryProps),
+      }),
+    });
+
+    return true;
+  }
+
+  private async openQueryEditor(queryJson:string, callback:(queryProps:unknown) => void) {
+    await this.servicesInitialization;
+
+    const currentQuery = JSON.parse(queryJson) as unknown;
+    const disabledTabs = {
+      'display-settings': I18n.t('js.work_packages.table_configuration.embedded_tab_disabled'),
+      timelines: I18n.t('js.work_packages.table_configuration.embedded_tab_disabled'),
+    };
+
+    if (!this.element.isConnected) return;
+
+    this.externalRelationQueryConfiguration.show({
+      currentQuery,
+      callback,
+      disabledTabs,
+    });
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/rows-drag-and-drop.controller.ts b/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/rows-drag-and-drop.controller.ts
new file mode 100644
index 00000000000..37291f9343c
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/admin/type-form-configuration/rows-drag-and-drop.controller.ts
@@ -0,0 +1,63 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import TypeFormConfigurationDragAndDropController from './drag-and-drop.controller';
+import type { Drake } from 'dragula';
+import type { DomAutoscrollService } from 'core-app/shared/helpers/drag-and-drop/dom-autoscroll.service';
+
+interface ReconnectableDragAndDropController {
+  drake:Drake|null;
+  autoscroll:DomAutoscrollService|null;
+  connect:() => void;
+}
+
+export default class TypeFormConfigurationRowsDragAndDropController extends TypeFormConfigurationDragAndDropController {
+  static targets = ['container', 'scrollContainer'];
+
+  async drop(el:Element, target:Element, source:Element|null, sibling:Element|null) {
+    await super.drop(el, target, source, sibling);
+
+    // After drop completes and DOM updates, reinitialize dragula
+    setTimeout(() => {
+      if (!this.element.isConnected) return;
+
+      const parent = this as unknown as ReconnectableDragAndDropController;
+      if (parent.drake) {
+        parent.drake.destroy();
+        parent.drake = null;
+      }
+      if (parent.autoscroll) {
+        parent.autoscroll.destroy();
+        parent.autoscroll = null;
+      }
+      super.connect();
+    }, 300);
+  }
+}
diff --git a/lib/open_project/journal_formatter/cause.rb b/lib/open_project/journal_formatter/cause.rb
index e4ba6e017b3..9df00bdaa93 100644
--- a/lib/open_project/journal_formatter/cause.rb
+++ b/lib/open_project/journal_formatter/cause.rb
@@ -243,7 +243,7 @@ class OpenProject::JournalFormatter::Cause < JournalFormatter::Base
     if related_work_package
       I18n.t(
         "journals.cause_descriptions.#{cause['type']}",
-        link: html? ? link_to_work_package(related_work_package, link_subject: true) : "##{related_work_package.id}"
+        link: html? ? link_to_work_package(related_work_package, link_subject: true) : related_work_package.formatted_id
       )
 
     else
diff --git a/lib_static/open_project/authentication/strategies/warden/session.rb b/lib_static/open_project/authentication/strategies/warden/session.rb
index b5a89522cbd..d6d4d0db3dc 100644
--- a/lib_static/open_project/authentication/strategies/warden/session.rb
+++ b/lib_static/open_project/authentication/strategies/warden/session.rb
@@ -50,8 +50,8 @@ module OpenProject
             return true if request.get?
 
             # For all other requests, to mitigate CSRF vectors,
-            # require the frontend header to be present.
-            xml_request_header_set?
+            # require browser indication that this was a same-origin request
+            same_origin?
           end
 
           def authenticate!
@@ -60,8 +60,8 @@ module OpenProject
             success! user
           end
 
-          def xml_request_header_set?
-            request.env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
+          def same_origin?
+            request.env["HTTP_SEC_FETCH_SITE"] == "same-origin"
           end
 
           def user_id
diff --git a/lib_static/plugins/acts_as_journalized/lib/journal_changes.rb b/lib_static/plugins/acts_as_journalized/lib/journal_changes.rb
index 2105a569e3f..bb400da4636 100644
--- a/lib_static/plugins/acts_as_journalized/lib/journal_changes.rb
+++ b/lib_static/plugins/acts_as_journalized/lib/journal_changes.rb
@@ -41,6 +41,7 @@ module JournalChanges
       get_custom_fields_changes,
       get_project_phases_changes,
       get_file_links_changes,
+      get_participants_changes,
       get_agenda_items_changes
     ].compact
 
@@ -150,8 +151,48 @@ module JournalChanges
     )
   end
 
+  def get_participants_changes
+    return unless journable.respond_to?(:participants)
+
+    baseline = participant_baseline_journal
+    return unless baseline
+
+    previous = participant_names_for(baseline, :invited)
+    current = participant_names_for(self, :invited)
+
+    added = current - previous
+    removed = previous - current
+
+    {
+      participants_added: participant_change_detail(added),
+      participants_removed: participant_change_detail(removed)
+    }.compact
+  end
+
   private
 
+  def participant_baseline_journal
+    journals = journable.journals.to_a
+    current_index = journals.index { |entry| entry.id == id }
+    return unless current_index
+
+    journals[0...current_index].reverse.find { |entry| entry.participant_journals.any? }
+  end
+
+  def participant_names_for(journal, attribute)
+    journal
+      .participant_journals
+      .select { |entry| entry.public_send(attribute) }
+      .filter_map { |entry| entry.user&.name }
+      .sort
+  end
+
+  def participant_change_detail(names)
+    return if names.empty?
+
+    [nil, names.join(", ")]
+  end
+
   def filter_admin_only_custom_fields(relation)
     return relation if User.current.admin?
     return relation unless journable.admin_only_custom_fields_allowed?
diff --git a/lookbook/previews/open_project/common/border_box_list_component_preview.rb b/lookbook/previews/open_project/common/border_box_list_component_preview.rb
new file mode 100644
index 00000000000..4a406b87055
--- /dev/null
+++ b/lookbook/previews/open_project/common/border_box_list_component_preview.rb
@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module OpenProject
+  module Common
+    # @logical_path OpenProject/Common
+    class BorderBoxListComponentPreview < ViewComponent::Preview
+      # @label Default
+      # @param interactive toggle
+      # @param collapsible toggle
+      def default(interactive: false, collapsible: false)
+        render OpenProject::Common::BorderBoxListComponent.new(
+          container: "border-box-list-preview",
+          interactive: boolean_preview_param(interactive),
+          collapsible: boolean_preview_param(collapsible)
+        ) do |list|
+          list.with_header(title: "Things we're building", count: true) do |header|
+            header.with_description { "There's lots to look forward to" }
+            header.with_action_button do |button|
+              button.with_leading_visual_icon(icon: :pencil)
+              "Edit"
+            end
+            header.with_menu(button_aria_label: "List actions") do |menu|
+              menu.with_item(label: "Configure") do |menu_item|
+                menu_item.with_leading_visual_icon(icon: :gear)
+              end
+            end
+          end
+
+          list.with_item { "Prioritized project launch" }
+          list.with_item { "Updated status reporting" }
+          list.with_item { "Shared team calendar" }
+          list.with_footer { "Next launch window: October" }
+        end
+      end
+
+      # @label With work package items
+      # @param interactive toggle
+      # @param collapsible toggle
+      def with_work_package_items(interactive: false, collapsible: false)
+        work_packages = WorkPackage.includes(:project).limit(2).to_a
+        return preview_message("No work packages in the database.") if work_packages.empty?
+
+        render OpenProject::Common::BorderBoxListComponent.new(
+          container: "border-box-list-work-package-preview",
+          interactive: boolean_preview_param(interactive),
+          collapsible: boolean_preview_param(collapsible)
+        ) do |list|
+          list.with_header(title: "Work packages", count: true)
+          render_work_package_items(list, work_packages)
+        end
+      end
+
+      # @label Playground
+      # @param collapsible toggle
+      # @param title_tag [Symbol] select [h2, h3, h4, h5]
+      # @param count [Symbol] select [inferred, hidden, explicit, zero]
+      # @param count_scheme [Symbol] select [primary, secondary]
+      # @param hide_zero_count toggle
+      # @param interactive toggle
+      def playground(
+        collapsible: false,
+        title_tag: :h4,
+        count: :inferred,
+        count_scheme: :primary,
+        hide_zero_count: true,
+        interactive: false
+      )
+        render OpenProject::Common::BorderBoxListComponent.new(
+          container: "border-box-list-playground-preview",
+          interactive: boolean_preview_param(interactive),
+          collapsible: boolean_preview_param(collapsible)
+        ) do |list|
+          list.with_header(
+            title: "Playground list",
+            title_tag: title_tag.to_sym,
+            count: preview_count(count),
+            count_arguments: {
+              scheme: count_scheme.to_sym,
+              hide_if_zero: boolean_preview_param(hide_zero_count),
+              aria: { label: "Visible list item count" }
+            }
+          ) do |header|
+            header.with_description { "Advanced header options" }
+          end
+
+          list.with_item { "First item" }
+          list.with_item { "Second item" }
+          list.with_footer { "Footer content" }
+        end
+      end
+
+      # @label Empty state
+      # List with a header and an empty state (Blankslate), no items.
+      # @param interactive toggle
+      # @param collapsible toggle
+      def empty_state(interactive: false, collapsible: false)
+        render OpenProject::Common::BorderBoxListComponent.new(
+          container: "border-box-list-empty-preview",
+          interactive: boolean_preview_param(interactive),
+          collapsible: boolean_preview_param(collapsible)
+        ) do |list|
+          list.with_header(title: "Empty list", count: 0)
+          list.with_empty_state(
+            title: "No items yet",
+            description: "There is nothing to show."
+          )
+        end
+      end
+
+      private
+
+      def preview_count(count)
+        case count.to_sym
+        when :inferred
+          true
+        when :hidden
+          false
+        when :explicit
+          7
+        when :zero
+          0
+        end
+      end
+
+      def boolean_preview_param(value)
+        ActiveModel::Type::Boolean.new.cast(value)
+      end
+
+      def preview_message(text)
+        render(Primer::Beta::Blankslate.new) do |blankslate|
+          blankslate.with_heading(tag: :h4).with_content(text)
+        end
+      end
+
+      def render_work_package_items(list, work_packages)
+        work_packages.each do |work_package|
+          list.with_work_package_item(work_package:) do |item|
+            item.with_menu(button_aria_label: "Work package actions") do |menu|
+              menu.with_item(label: "Open", href: "/work_packages/#{work_package.id}") do |menu_item|
+                menu_item.with_leading_visual_icon(icon: :link)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lookbook/previews/open_project/common/work_package_card_list_component_preview.rb b/lookbook/previews/open_project/common/work_package_card_list_component_preview.rb
deleted file mode 100644
index fa9bb524768..00000000000
--- a/lookbook/previews/open_project/common/work_package_card_list_component_preview.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-module OpenProject
-  module Common
-    # @logical_path OpenProject/Common
-    class WorkPackageCardListComponentPreview < ViewComponent::Preview
-      include ActionView::RecordIdentifier
-
-      def sprint_with_cards
-        sprint = Sprint.first
-        project = sprint&.project
-        return preview_message("No sprints in the database.") unless sprint && project
-
-        work_packages = sprint.work_packages_for(project).limit(3)
-        render OpenProject::Common::WorkPackageCardListComponent.new(
-          work_packages:,
-          project:,
-          container: sprint
-        ) do |list|
-          list.with_header(title: sprint.name, count: work_packages.size) do |header|
-            points = work_packages.sum { |w| w.story_points || 0 }
-            header.with_description { "#{points} points" }
-          end
-          list.with_empty_state(title: "Sprint is empty", description: "Drag work packages here")
-        end
-      end
-
-      def empty_sprint
-        sprint = Sprint.first
-        project = sprint&.project
-        return preview_message("No sprints in the database.") unless sprint && project
-
-        render OpenProject::Common::WorkPackageCardListComponent.new(
-          work_packages: [], project:, container: sprint
-        ) do |list|
-          list.with_header(title: sprint.name, count: 0) do |header|
-            header.with_description { "0 points" }
-          end
-          list.with_empty_state(title: "Sprint is empty", description: "Drag work packages here")
-        end
-      end
-
-      def inbox
-        project = Project.first
-        return preview_message("No project in the database.") unless project
-
-        render OpenProject::Common::WorkPackageCardListComponent.new(
-          work_packages: [],
-          project:,
-          container: dom_target(:inbox, project)
-        ) do |list|
-          list.with_empty_state(title: "Inbox is empty", description: "All caught up",
-                               icon: :"op-backlogs")
-        end
-      end
-
-      def manual_item
-        work_package = WorkPackage.first
-        project = work_package&.project
-        return preview_message("No work packages in the database.") unless work_package && project
-
-        render OpenProject::Common::WorkPackageCardListComponent.new(
-          project:,
-          container: :manual_item_demo
-        ) do |list|
-          list.with_empty_state(title: "No items", description: "Manual items can be added by callers")
-          list.with_work_package_item(work_package:)
-          list.with_item(scheme: :neutral) { "Caller-provided item" }
-        end
-      end
-
-      private
-
-      # ViewComponent's `Preview.render_args` expects each preview method to
-      # return a Hash (it does `result[:template] = …`), so plain string
-      # returns fail with "no implicit conversion of Symbol into Integer".
-      # Wrap fallback messages in a Blankslate render so they go through the
-      # standard hash path.
-      def preview_message(text)
-        render(Primer::Beta::Blankslate.new) do |b|
-          b.with_heading(tag: :h4).with_content(text)
-        end
-      end
-    end
-  end
-end
diff --git a/modules/auth_saml/config/locales/crowdin/hy.yml b/modules/auth_saml/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..bb9dfe30506
--- /dev/null
+++ b/modules/auth_saml/config/locales/crowdin/hy.yml
@@ -0,0 +1,191 @@
+---
+hy:
+  activerecord:
+    attributes:
+      saml/provider:
+        display_name: Name
+        identifier: Identifier
+        secret: Secret
+        scope: Scope
+        assertion_consumer_service_url: ACS (Assertion consumer service) URL
+        limit_self_registration: Limit self registration
+        sp_entity_id: Service entity ID
+        metadata_url: Identity provider metadata URL
+        name_identifier_format: Name identifier format
+        idp_sso_service_url: Identity provider login endpoint
+        idp_slo_service_url: Identity provider logout endpoint
+        idp_cert: Public certificate of identity provider
+        authn_requests_signed: Sign SAML AuthnRequests
+        want_assertions_signed: Require signed responses
+        want_assertions_encrypted: Require encrypted responses
+        certificate: Certificate used by OpenProject for SAML requests
+        private_key: Corresponding private key for OpenProject SAML requests
+        signature_method: Signature algorithm
+        digest_method: Digest algorithm
+        format: Format
+        icon: Custom icon
+    errors:
+      models:
+        saml/provider:
+          invalid_certificate: 'is not a valid PEM-formatted certificate: %{additional_message}'
+          invalid_private_key: 'is not a valid PEM-formatted private key: %{additional_message}'
+          certificate_expired: is expired and can no longer be used.
+          unmatched_private_key: does not belong to the given certificate
+  saml:
+    menu_title: SAML providers
+    delete_title: Delete SAML provider
+    delete_heading: Delete this SAML provider?
+    info:
+      title: SAML Protocol Configuration Parameters
+      description: 'Use these parameters to configure your identity provider connection to OpenProject.
+
+        '
+    metadata_parser:
+      success: Successfully updated the configuration using the identity provider metadata.
+      invalid_url: Provided metadata URL is invalid. Provide a HTTP(s) URL.
+      error: 'Failed to retrieve the identity provider metadata: %{error}'
+    providers:
+      label_empty_title: No SAML providers configured yet.
+      label_empty_description: Add a provider to see them here.
+      label_automatic_configuration: Automatic configuration
+      label_metadata: Metadata
+      label_metadata_endpoint: OpenProject metadata endpoint
+      label_openproject_information: OpenProject information
+      label_configuration_details: Identity provider endpoints and certificates
+      label_configuration_encryption: Signatures and Encryption
+      label_add_new: New SAML identity provider
+      label_edit: Edit SAML identity provider %{name}
+      label_uid: Internal user id
+      label_mapping: Mapping
+      label_requested_attribute_for: 'Requested attribute for: %{attribute}'
+      no_results_table: No SAML identity providers have been defined yet.
+      notice_created: A new SAML identity provider was successfully created.
+      plural: SAML identity providers
+      singular: SAML identity provider
+      requested_attributes: Requested attributes
+      attribute_mapping: Attribute mapping
+      attribute_mapping_text: 'The following fields control which attributes provided by the SAML identity provider are used to provide user attributes in OpenProject
+
+        '
+      metadata:
+        dialog: 'This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider:'
+      upsell:
+        title: Single Sign-On (SSO) with SAML
+        description: Connect OpenProject to a SAML identity provider
+      request_attributes:
+        title: Requested attributes
+        legend: 'These attributes are added to the SAML XML metadata to signify to the identify provider which attributes OpenProject requires. You may still need to explicitly configure your identity provider to send these attributes. Please refer to your IdP''s documentation.
+
+          '
+        name: Requested attribute key
+        format: Attribute format
+      section_headers:
+        configuration: Primary configuration
+        attributes: Attributes
+      section_texts:
+        display_name: Configure the display name of the SAML provider.
+        metadata: Pre-fill configuration using a metadata URL or by pasting metadata XML
+        metadata_form: If your identity provider has a metadata endpoint or XML download, add it below to pre-fill the configuration.
+        metadata_form_banner: 'Editing the metadata may override existing values in other sections. '
+        configuration: Configure the endpoint URLs for the identity provider, certificates, and further SAML options.
+        configuration_metadata: This information has been pre-filled using the supplied metadata. In most cases, they do not require editing.
+        encryption: Configure assertion signatures and encryption for SAML requests and responses.
+        encryption_form: You may optionally want to encrypt the assertion response, or have requests from OpenProject signed.
+        mapping: Manually adjust the mapping between the SAML response and user attributes in OpenProject.
+        requested_attributes: Define the set of attributes to be requested in the SAML request sent to your identity provider.
+      seeded_from_env: This provider was seeded from the environment configuration. It cannot be edited.
+    settings:
+      metadata_none: I don't have metadata
+      metadata_url: Metadata URL
+      metadata_xml: Metadata XML
+    instructions:
+      documentation_link: 'Please refer to our [documentation on configuring SAML providers](docs_url) for more information on these configuration options.
+
+        '
+      display_name: 'The name of the provider. This will be displayed as the login button and in the list of providers.
+
+        '
+      metadata_none: 'Your identity provider does not have a metadata endpoint or XML download option. You can configure it manually.
+
+        '
+      metadata_url: 'Your identity provider provides a metadata URL.
+
+        '
+      metadata_xml: 'Your identity provider provides a metadata XML download.
+
+        '
+      limit_self_registration: 'If enabled users can only register using this provider if the self registration setting allows for it.
+
+        '
+      sp_entity_id: 'The entity ID of the service provider (SP). Sometimes also referred to as Audience. This is the unique client identifier of the OpenProject instance.
+
+        '
+      idp_sso_service_url: 'The URL of the identity provider login endpoint.
+
+        '
+      idp_slo_service_url: 'The URL of the identity provider logout endpoint.
+
+        '
+      idp_cert: 'Enter the X509 PEM-formatted public certificate of the identity provider. You can enter multiple certificates by separating them with a newline.
+
+        '
+      name_identifier_format: 'Set the name identifier format to be used for the SAML assertion.
+
+        '
+      sp_metadata_endpoint: 'This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider.
+
+        '
+      mapping: 'Configure the mapping between the SAML response and user attributes in OpenProject. You can configure multiple attribute names to look for. OpenProject will choose the first available attribute from the SAML response.
+
+        '
+      mapping_login: 'SAML attributes from the response used for the login.
+
+        '
+      mapping_mail: 'SAML attributes from the response used for the email of the user.
+
+        '
+      mapping_firstname: 'SAML attributes from the response used for the given name.
+
+        '
+      mapping_lastname: 'SAML attributes from the response used for the last name.
+
+        '
+      mapping_uid: 'SAML attribute to use for the internal user ID. Leave empty to use the name_id attribute instead
+
+        '
+      request_uid: 'SAML attribute to request for the internal user ID. By default, the name_id will be used for this field.
+
+        '
+      requested_attributes: 'These attributes are added to the SAML request XML to communicate to the identity provider which attributes OpenProject requires.
+
+        '
+      requested_format: 'The format of the requested attribute. This is used to specify the format of the attribute in the SAML request. Please see [documentation on configuring requested attributes](docs_url) for more information.
+
+        '
+      authn_requests_signed: 'If checked, OpenProject will sign the SAML AuthnRequest. You will have to provide a signing certificate and private key using the fields below.
+
+        '
+      want_assertions_signed: 'If checked, OpenProject will required signed responses from the identity provider using its own certificate keypair. OpenProject will verify the signature against the certificate from the basic configuration section.
+
+        '
+      want_assertions_encrypted: 'If enabled, require the identity provider to encrypt the assertion response using the certificate pair that you provide.
+
+        '
+      certificate: 'Enter the X509 PEM-formatted certificate used by OpenProject for signing SAML requests.
+
+        '
+      private_key: 'Enter the X509 PEM-formatted private key for the above certificate. This needs to be an RSA private key.
+
+        '
+      signature_method: 'Select the signature algorithm to use for the SAML request signature performed by OpenProject (Default: %{default_option}).
+
+        '
+      digest_method: 'Select the digest algorithm to use for the SAML request signature performed by OpenProject (Default: %{default_option}).
+
+        '
+      icon: 'Optionally provide a public URL to an icon graphic that will be displayed next to the provider name.
+
+        '
+      metadata_for_idp: 'This information might be requested by your SAML identity provider.
+
+        '
diff --git a/modules/auth_saml/config/locales/crowdin/tr.yml b/modules/auth_saml/config/locales/crowdin/tr.yml
index a8d2cadf307..ff8dafdebc5 100644
--- a/modules/auth_saml/config/locales/crowdin/tr.yml
+++ b/modules/auth_saml/config/locales/crowdin/tr.yml
@@ -34,7 +34,7 @@ tr:
   saml:
     menu_title: SAML sağlayıcıları
     delete_title: SAML sağlayıcısını sil
-    delete_heading: Delete this SAML provider?
+    delete_heading: Bu SAML sağlayıcıyı silmek istiyor musunuz?
     info:
       title: SAML Protokolü Yapılandırma Parametreleri
       description: 'OpenProject ile kimlik sağlayıcı bağlantınızı yapılandırmak için bu parametreleri kullanın.
diff --git a/modules/avatars/config/locales/crowdin/hy.yml b/modules/avatars/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..73ecbec57a3
--- /dev/null
+++ b/modules/avatars/config/locales/crowdin/hy.yml
@@ -0,0 +1,43 @@
+#English strings go here
+---
+hy:
+  plugin_openproject_avatars:
+    name: Avatars
+    description: This plugin allows OpenProject users to upload a picture to be used as an avatar or use registered images from Gravatar.
+  label_avatar: Avatar
+  label_avatar_plural: Avatars
+  label_current_avatar: Current Avatar
+  label_choose_avatar: Choose Avatar from file
+  message_avatar_uploaded: Avatar changed successfully.
+  error_image_upload: Error saving the image.
+  error_image_size: The image is too large.
+  are_you_sure_delete_avatar: Are you sure you want to delete your avatar?
+  avatar_deleted: Avatar deleted successfully.
+  unable_to_delete_avatar: Avatar could not be deleted.
+  wrong_file_format: Allowed formats are jpg, png, gif
+  empty_file_error: Please upload a valid image (jpg, png, gif)
+  avatars:
+    label_avatar: Avatar
+    label_gravatar: Gravatar
+    label_current_avatar: Current avatar
+    label_local_avatar: Custom avatar
+    text_current_avatar: 'The following image shows the current avatar.
+
+      '
+    text_upload_instructions: |
+      Upload your own custom avatar of 128 by 128 pixels. Larger files will be resized and cropped to match.
+      A preview of your avatar will be shown before uploading, once you selected an image.
+    text_change_gravatar_html: To change or add the Gravatar for your mail address, go to %{gravatar_url}.
+    text_your_local_avatar: 'OpenProject allows you to upload your own custom avatar.
+
+      '
+    text_local_avatar_over_gravatar: 'If you set one, this custom avatar is used in precedence over the gravatar above.
+
+      '
+    text_your_current_gravatar: |
+      OpenProject uses your gravatar if you registered one, or a default image or icon if one exists.
+      The current gravatar is as follows:
+    settings:
+      enable_gravatars: Enable user gravatars
+      gravatar_default: Default Gravatar image
+      enable_local_avatars: Enable user custom avatars
diff --git a/modules/avatars/config/locales/crowdin/js-hy.yml b/modules/avatars/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..3d38b48a702
--- /dev/null
+++ b/modules/avatars/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,15 @@
+#English strings go here
+---
+hy:
+  js:
+    label_preview: Preview
+    button_update: Update
+    avatars:
+      label_choose_avatar: Choose Avatar from file
+      uploading_avatar: Uploading your avatar.
+      text_upload_instructions: |
+        Upload your own custom avatar of 128 by 128 pixels. Larger files will be resized and cropped to match.
+        A preview of your avatar will be shown before uploading, once you selected an image.
+      error_image_too_large: Image is too large.
+      wrong_file_format: Allowed formats are jpg, png, gif
+      empty_file_error: Please upload a valid image (jpg, png, gif)
diff --git a/modules/avatars/frontend/module/avatar-upload-form/avatar-upload-form.component.ts b/modules/avatars/frontend/module/avatar-upload-form/avatar-upload-form.component.ts
index 2d47a6ac735..1ddb98d6269 100644
--- a/modules/avatars/frontend/module/avatar-upload-form/avatar-upload-form.component.ts
+++ b/modules/avatars/frontend/module/avatar-upload-form/avatar-upload-form.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild, } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core';
 
 import { resizeFile } from 'core-app/shared/helpers/images/resizer';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -44,6 +44,12 @@ import { HttpErrorResponse } from '@angular/common/http';
   standalone: false,
 })
 export class AvatarUploadFormComponent implements OnInit {
+  protected I18n = inject(I18nService);
+  protected elementRef = inject(ElementRef);
+  protected cdRef = inject(ChangeDetectorRef);
+  protected toastService = inject(ToastService);
+  protected uploadService = inject(OpUploadService);
+
   public form:any;
 
   public target:string;
@@ -71,14 +77,6 @@ export class AvatarUploadFormComponent implements OnInit {
     preview: this.I18n.t('js.label_preview'),
   };
 
-  public constructor(
-    protected I18n:I18nService,
-    protected elementRef:ElementRef,
-    protected cdRef:ChangeDetectorRef,
-    protected toastService:ToastService,
-    protected uploadService:OpUploadService,
-  ) { }
-
   public ngOnInit() {
     const element = this.elementRef.nativeElement as HTMLElement;
     this.target = element.getAttribute('target') || '';
diff --git a/modules/avatars/frontend/module/avatar-upload.service.ts b/modules/avatars/frontend/module/avatar-upload.service.ts
index 64d16ad7164..b96bcd1d912 100644
--- a/modules/avatars/frontend/module/avatar-upload.service.ts
+++ b/modules/avatars/frontend/module/avatar-upload.service.ts
@@ -28,7 +28,7 @@
 
 import { Observable } from 'rxjs';
 import { share } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HttpClient, HttpEvent } from '@angular/common/http';
 
 import { IUploadFile, OpUploadService } from 'core-app/core/upload/upload.service';
@@ -39,11 +39,8 @@ export interface AvatarUploadFile extends IUploadFile {
 
 @Injectable()
 export class AvatarUploadService extends OpUploadService {
-  constructor(
-    private readonly http:HttpClient,
-  ) {
-    super();
-  }
+  private readonly http = inject(HttpClient);
+
 
   public upload<T>(
     href:string,
diff --git a/modules/avatars/frontend/module/main.ts b/modules/avatars/frontend/module/main.ts
index f61d3647091..94e85a02d4a 100644
--- a/modules/avatars/frontend/module/main.ts
+++ b/modules/avatars/frontend/module/main.ts
@@ -24,7 +24,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { AvatarUploadFormComponent } from './avatar-upload-form/avatar-upload-form.component';
 import { registerCustomElement } from 'core-app/shared/helpers/angular/custom-elements.helper';
@@ -38,7 +38,9 @@ import { registerCustomElement } from 'core-app/shared/helpers/angular/custom-el
   ],
 })
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     registerCustomElement('opce-avatar-upload-form', AvatarUploadFormComponent, { injector });
   }
 }
diff --git a/modules/backlogs/app/components/_index.sass b/modules/backlogs/app/components/_index.sass
new file mode 100644
index 00000000000..f28a7206a85
--- /dev/null
+++ b/modules/backlogs/app/components/_index.sass
@@ -0,0 +1 @@
+@import "./backlogs/work_package_card_list_component.sass"
diff --git a/modules/backlogs/app/components/backlogs/bucket_component.html.erb b/modules/backlogs/app/components/backlogs/bucket_component.html.erb
index 30f81119db2..e9829d3d0e7 100644
--- a/modules/backlogs/app/components/backlogs/bucket_component.html.erb
+++ b/modules/backlogs/app/components/backlogs/bucket_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= component_wrapper(tag: :section) do %>
   <%= render(
-        OpenProject::Common::WorkPackageCardListComponent.new(
+        Backlogs::WorkPackageCardListComponent.new(
           work_packages:,
           project:,
           container: backlog_bucket,
@@ -37,13 +37,12 @@ See COPYRIGHT and LICENSE files for more details.
             target_id: "backlog_bucket:#{backlog_bucket.id}",
             allowed_drag_type: "story"
           },
-          item_component_klass: Backlogs::WorkPackageCardListItemComponent,
           params: all_backlogs_params,
           current_user:,
-          data: { test_selector: "backlog-bucket-#{backlog_bucket.id}" }
+          test_selector: "backlog-bucket-#{backlog_bucket.id}"
         )
       ) do |list| %>
-    <% list.with_header(title: backlog_bucket.name, count: work_packages.size) do |header| %>
+    <% list.with_header(title: backlog_bucket.name) do |header| %>
       <% if show_menu? %>
         <% header.with_menu(button_aria_label: t(".label_actions")) do |menu| %>
           <% with_item_group(menu) do %>
diff --git a/modules/backlogs/app/components/backlogs/inbox_component.html.erb b/modules/backlogs/app/components/backlogs/inbox_component.html.erb
index f8a6e7eff2a..e2f05287ec0 100644
--- a/modules/backlogs/app/components/backlogs/inbox_component.html.erb
+++ b/modules/backlogs/app/components/backlogs/inbox_component.html.erb
@@ -28,18 +28,20 @@ See COPYRIGHT and LICENSE files for more details.
 ++# %>
 
 <%= component_wrapper(tag: :section) do %>
+  <% inbox_container = dom_target(:inbox, project) %>
   <%= render(
-        OpenProject::Common::WorkPackageCardListComponent.new(
-          project:,
-          container: dom_target(:inbox, project),
-          drag_and_drop: {
-            target_id: "inbox",
-            allowed_drag_type: "story"
-          },
-          item_component_klass: Backlogs::WorkPackageCardListItemComponent,
-          params: all_backlogs_params,
+        OpenProject::Common::BorderBoxListComponent.new(
+          container: inbox_container,
           current_user:,
-          data: { test_selector: "backlog-inbox" }
+          interactive: true,
+          padding: :condensed,
+          test_selector: "backlog-inbox",
+          data: {
+            generic_drag_and_drop_target: "container",
+            target_container_accessor: ":scope > ul",
+            target_id: "inbox",
+            target_allowed_drag_type: "story"
+          }
         )
       ) do |list| %>
     <% list.with_empty_state(
@@ -50,7 +52,12 @@ See COPYRIGHT and LICENSE files for more details.
        ) %>
 
     <% visible_work_packages.each.with_index do |work_package, index| %>
-      <% list.with_work_package_item(work_package:) %>
+      <% list.with_work_package_item(
+           work_package:,
+           project:,
+           params: all_backlogs_params,
+           component_klass: Backlogs::WorkPackageCardListItemComponent
+         ) %>
 
       <% if truncated? && index == TRUNCATE_MIDDLE - 1 %>
         <% list.with_item(
diff --git a/modules/backlogs/app/components/backlogs/sprint_component.html.erb b/modules/backlogs/app/components/backlogs/sprint_component.html.erb
index c4053ca23e9..c798db47e12 100644
--- a/modules/backlogs/app/components/backlogs/sprint_component.html.erb
+++ b/modules/backlogs/app/components/backlogs/sprint_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= component_wrapper(tag: :section) do %>
   <%= render(
-        OpenProject::Common::WorkPackageCardListComponent.new(
+        Backlogs::WorkPackageCardListComponent.new(
           work_packages:,
           project:,
           container: sprint,
@@ -37,13 +37,12 @@ See COPYRIGHT and LICENSE files for more details.
             target_id: "sprint:#{sprint.id}",
             allowed_drag_type: "story"
           },
-          item_component_klass: Backlogs::WorkPackageCardListItemComponent,
           params: all_backlogs_params,
           current_user:,
-          data: { test_selector: "sprint-#{sprint.id}" }
+          test_selector: "sprint-#{sprint.id}"
         )
       ) do |list| %>
-    <% list.with_header(title: sprint.name, count: work_packages.size) do |header| %>
+    <% list.with_header(title: sprint.name) do |header| %>
       <% header.with_description do %>
         <%= render(
               Primer::Beta::Text.new(
diff --git a/modules/backlogs/app/components/backlogs/sprint_component.rb b/modules/backlogs/app/components/backlogs/sprint_component.rb
index 6fe512292e1..7a793ce6fbf 100644
--- a/modules/backlogs/app/components/backlogs/sprint_component.rb
+++ b/modules/backlogs/app/components/backlogs/sprint_component.rb
@@ -69,7 +69,7 @@ module Backlogs
     end
 
     def start_sprint_button_arguments
-      base_arguments = { id: dom_target(sprint, :start_button), scheme: :invisible }
+      base_arguments = { id: dom_target(sprint, :start_button) }
 
       if disable_start_sprint_action?
         base_arguments.merge(tag: :button, inactive: true, aria: { disabled: true })
@@ -85,7 +85,6 @@ module Backlogs
     def finish_sprint_button_arguments
       {
         id: dom_target(sprint, :finish_button),
-        scheme: :invisible,
         tag: :a,
         href: finish_project_backlogs_sprint_path(project, sprint, all_backlogs_params),
         data: { turbo_method: :post }
diff --git a/modules/backlogs/app/components/backlogs/work_package_card_list_component.rb b/modules/backlogs/app/components/backlogs/work_package_card_list_component.rb
new file mode 100644
index 00000000000..5122de033ed
--- /dev/null
+++ b/modules/backlogs/app/components/backlogs/work_package_card_list_component.rb
@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Backlogs
+  class WorkPackageCardListComponent < ApplicationComponent
+    include Primer::AttributesHelper
+    include OpPrimer::ComponentHelpers
+
+    delegate :with_empty_state, :with_footer, :empty_state?, to: :@list
+
+    attr_reader :work_packages,
+                :project,
+                :container,
+                :drag_and_drop,
+                :params,
+                :current_user
+
+    def initialize(
+      project:,
+      container:,
+      work_packages: nil,
+      drag_and_drop: nil,
+      params: {},
+      current_user: User.current,
+      **system_arguments
+    )
+      super()
+
+      @work_packages = work_packages || []
+      @project = project
+      @container = container
+      @drag_and_drop = drag_and_drop
+      @params = params
+      @current_user = current_user
+
+      @system_arguments = system_arguments
+      @system_arguments[:padding] = :condensed
+      merge_drag_and_drop_data! if drag_and_drop
+
+      @list = OpenProject::Common::BorderBoxListComponent.new(
+        container:,
+        current_user:,
+        interactive: true,
+        **@system_arguments
+      )
+    end
+
+    def with_header(
+      title:,
+      count: work_packages.size,
+      count_label: default_count_label(count),
+      **system_arguments,
+      &
+    )
+      @list.with_header(
+        title:,
+        count:,
+        count_label:,
+        **system_arguments,
+        &
+      )
+    end
+
+    def before_render
+      content
+      populate_list!
+      validate_empty_state!
+    end
+
+    def call
+      render(@list)
+    end
+
+    private
+
+    def merge_drag_and_drop_data!
+      @system_arguments[:data] = merge_data(
+        {
+          data: drag_and_drop_data
+        },
+        @system_arguments
+      )
+    end
+
+    def drag_and_drop_data
+      {
+        generic_drag_and_drop_target: "container",
+        target_container_accessor: ":scope > ul",
+        target_id: drag_and_drop.fetch(:target_id),
+        target_allowed_drag_type: drag_and_drop.fetch(:allowed_drag_type)
+      }
+    end
+
+    def default_count_label(count)
+      return unless count
+
+      I18n.t(:label_x_work_packages, count: count == true ? work_packages.size : count)
+    end
+
+    def populate_list!
+      return if work_packages.empty?
+
+      work_packages.each do |work_package|
+        @list.with_work_package_item(
+          work_package:,
+          project:,
+          params:,
+          component_klass: Backlogs::WorkPackageCardListItemComponent
+        )
+      end
+    end
+
+    def validate_empty_state!
+      return unless work_packages.empty? && !empty_state?
+
+      raise ArgumentError, "empty_state slot is required when no work package items are rendered"
+    end
+  end
+end
diff --git a/app/components/open_project/common/work_package_card_list_component.sass b/modules/backlogs/app/components/backlogs/work_package_card_list_component.sass
similarity index 100%
rename from app/components/open_project/common/work_package_card_list_component.sass
rename to modules/backlogs/app/components/backlogs/work_package_card_list_component.sass
diff --git a/modules/backlogs/app/components/backlogs/work_package_card_list_item_component.rb b/modules/backlogs/app/components/backlogs/work_package_card_list_item_component.rb
index 2686487887a..3197d1f1c5d 100644
--- a/modules/backlogs/app/components/backlogs/work_package_card_list_item_component.rb
+++ b/modules/backlogs/app/components/backlogs/work_package_card_list_item_component.rb
@@ -29,13 +29,13 @@
 #++
 
 module Backlogs
-  class WorkPackageCardListItemComponent < OpenProject::Common::WorkPackageCardListComponent::Item
-    def card
-      @card ||= WorkPackageCardComponent.new(work_package:, menu_src:)
-    end
-
+  class WorkPackageCardListItemComponent < OpenProject::Common::BorderBoxListComponent::WorkPackageItem
     private
 
+    def build_card
+      WorkPackageCardComponent.new(work_package:, menu_src:)
+    end
+
     def draggable?
       current_user.allowed_in_project?(:manage_sprint_items, project)
     end
diff --git a/modules/backlogs/config/locales/crowdin/cs.yml b/modules/backlogs/config/locales/crowdin/cs.yml
index 5c6197b20a1..831f796c945 100644
--- a/modules/backlogs/config/locales/crowdin/cs.yml
+++ b/modules/backlogs/config/locales/crowdin/cs.yml
@@ -29,15 +29,15 @@ cs:
       project:
         sprint_sharing: Sdílení sprintu
       sprint:
-        duration: Duration
-        finish_date: Finish date
-        goal: Sprint goal
-        name: Sprint name
-        sharing: Sharing
+        duration: Doba trvání
+        finish_date: Datum ukončení
+        goal: Cíl sprintu
+        name: Název sprintu
+        sharing: Sdílení
         statuses:
-          in_planning: In planning
-          active: Active
-          completed: Completed
+          in_planning: V plánování
+          active: Aktivní
+          completed: Dokončen
       user_preference:
         backlogs_versions_default_fold_state: Show sprints folded
       work_package:
diff --git a/modules/backlogs/config/locales/crowdin/de.yml b/modules/backlogs/config/locales/crowdin/de.yml
index 1a2acb6b630..f102e0382f6 100644
--- a/modules/backlogs/config/locales/crowdin/de.yml
+++ b/modules/backlogs/config/locales/crowdin/de.yml
@@ -113,26 +113,26 @@ de:
       title: Die Einstellungen des Backlogs-Moduls sind derzeit in der Entwicklung
       text: Wir gestalten gerade das Backlogs-Modul neu. Die Einstellungen für Sprints und Backlogs werden in naher Zukunft hier sichtbar sein. Einstellungen auf Projektebene bleiben weiterhin verfügbar.
     bucket_component:
-      blankslate_title: Backlog bucket is empty
-      blankslate_description: Drag items here to add them.
-      label_actions: Backlog bucket actions
+      blankslate_title: Backlog Bucket ist leer
+      blankslate_description: Ziehen Sie Arbeitspakete hierher, um sie hinzuzufügen.
+      label_actions: Backlog Bucket Aktionen
       action_menu:
-        edit_backlog_bucket: Edit backlog bucket
-        delete_backlog_bucket: Delete backlog bucket
+        edit_backlog_bucket: Backlog Bucket bearbeiten
+        delete_backlog_bucket: Backlog Bucket löschen
     backlog_bucket_destroy_modal_component:
       title: Backlog Bucket löschen?
       details: Der Backlog Bucket '%{name}' wird gelöscht und alle Arbeitspakete werden in den Eingangs Backlog verschoben. Kein Arbeitspaket wird gelöscht.
     sprint_component:
       blankslate_title: "%{name} ist leer"
       blankslate_description: Noch keine Arbeitspakete geplant. Ziehen Sie Arbeitspakete hierher, um sie hinzuzufügen.
-      label_actions: Sprint actions
+      label_actions: Sprint-Aktionen
       label_start_sprint: Start
-      label_complete_sprint: Complete
-      start_sprint_disabled_reason_active_sprint: Another sprint is already active.
-      start_sprint_disabled_reason_missing_dates: Start and finish dates are required in order to start the sprint.
+      label_complete_sprint: Abgeschlossen
+      start_sprint_disabled_reason_active_sprint: Ein anderer Sprint ist bereits aktiv.
+      start_sprint_disabled_reason_missing_dates: Start- und Enddatum sind erforderlich, um den Sprint zu starten.
       action_menu:
-        edit_sprint: Edit sprint
-        add_work_package: Add work package
+        edit_sprint: Sprint bearbeiten
+        add_work_package: Arbeitspaket hinzufügen
     inbox_component:
       blankslate_title: Eingangs-Backlog ist leer
       blankslate_description: Alle offenen Arbeitspakete in diesem Projekt werden automatisch hier angezeigt.
@@ -183,7 +183,7 @@ de:
     story_points_ideal: Story-Points (ideal)
   label_backlog: Backlog
   label_backlog_bucket_edit: Backlog Bucket bearbeiten
-  label_backlog_bucket_new: Neuer Backlog-Bucket
+  label_backlog_bucket_new: Neuer Backlog Bucket
   label_inbox: Posteingang
   label_backlogs: Backlogs
   label_burndown_chart: Burndown-Diagramm
diff --git a/modules/backlogs/config/locales/crowdin/fr.yml b/modules/backlogs/config/locales/crowdin/fr.yml
index caf2f7676c3..774faee4b4e 100644
--- a/modules/backlogs/config/locales/crowdin/fr.yml
+++ b/modules/backlogs/config/locales/crowdin/fr.yml
@@ -120,8 +120,8 @@ fr:
         edit_backlog_bucket: Modifier le backlog en attente
         delete_backlog_bucket: Supprimer un bucket de backlog
     backlog_bucket_destroy_modal_component:
-      title: Delete backlog bucket?
-      details: The backlog bucket '%{name}' will be deleted and all work packages will be moved to the backlog inbox. No work package will be deleted.
+      title: Supprimer le bucket de backlog ?
+      details: Le bucket de backlog « %{name} » sera supprimé et tous les lots de travaux seront déplacés vers la boîte de réception des backlogs. Aucun lot de travaux ne sera supprimé.
     sprint_component:
       blankslate_title: "%{name} est vide"
       blankslate_description: Aucun élément n'a encore été planifié. Faites glisser les éléments ici pour les ajouter.
diff --git a/modules/backlogs/config/locales/crowdin/hy.yml b/modules/backlogs/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..d47d990f15a
--- /dev/null
+++ b/modules/backlogs/config/locales/crowdin/hy.yml
@@ -0,0 +1,231 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  plugin_openproject_backlogs:
+    name: OpenProject Backlogs
+    description: This module adds features enabling agile teams to work with OpenProject in Scrum projects.
+  activerecord:
+    attributes:
+      project:
+        sprint_sharing: Sprint sharing
+      sprint:
+        duration: Duration
+        finish_date: Finish date
+        goal: Sprint goal
+        name: Sprint name
+        sharing: Sharing
+        statuses:
+          in_planning: In planning
+          active: Active
+          completed: Completed
+      user_preference:
+        backlogs_versions_default_fold_state: Show sprints folded
+      work_package:
+        backlog_bucket: Backlog Bucket
+        backlogs_work_package_type: Backlog type
+        position: Position
+        sprint: Sprint
+        story_points: Story Points
+    errors:
+      messages:
+        must_be_in_planning: must be in planning to start.
+        only_one_active_sprint_allowed: only one active sprint is allowed per project.
+        dates_required: Start and finish dates are required in order to start the sprint.
+      models:
+        project:
+          receiving_sprints: is receiving shared sprints. Own sprints cannot be created.
+          attributes:
+            sprint_sharing:
+              share_all_projects_already_taken: cannot be set because project "%{name}" is already sharing with all projects.
+              share_all_projects_already_taken_anonymous: cannot be set because another project is already sharing with all projects.
+        sprint:
+          attributes:
+            base:
+              unfinished_work_packages:
+                one: There is one work package that was not completed in this sprint.
+                other: There are %{count} work packages that were not completed in this sprint.
+              format: "%{message}"
+            status:
+              not_active: is not active so it cannot be closed.
+        work_package:
+          backlog_bucket_xor_sprint: cannot be assigned to both a sprint and a backlog bucket.
+          attributes:
+            backlog_bucket:
+              backlog_bucket_from_another_project: must belong to the same project as the work package.
+            blocks_ids:
+              can_only_contain_work_packages_of_current_sprint: can only contain IDs of work packages in the current sprint.
+              must_block_at_least_one_work_package: must contain the ID of at least one ticket.
+            version_id:
+              task_version_must_be_the_same_as_story_version: must be the same as the parent story's version.
+            sprint:
+              not_assignable: is not assignable since it is either not shared with the project or already finished.
+              not_eligible_for_moving: is not an active sprint in the project which holds the sprint the work package is moved out of.
+    models:
+      sprint: Sprint
+  backlogs:
+    caption_sprints_default_fold_state: Sprints will not be expanded by default when viewing the 'Backlog and sprints' page. Each one has to be manually expanded.
+    definition_of_done: Definition of Done
+    definition_of_done_caption: Work packages with these statuses are treated as completed in backlog views and reporting.
+    done_status: Done status
+    sharing_description: This project can either share its own sprints, receive shared sprints or handle sprints independently (no sharing).
+    sharing: Sharing
+    label_burndown_chart: Burndown chart
+    label_sprint_board: Sprint board
+    work_package_is_closed: Work package is done, when
+    label_is_done_status: Status %{status_name} means done
+    points_label:
+      one: point
+      other: points
+    positions_could_not_be_rebuilt: Positions could not be rebuilt.
+    positions_rebuilt_successfully: Positions rebuilt successfully.
+    rebuild: Rebuild
+    rebuild_positions: Rebuild positions
+    remaining_hours: Remaining work
+    show_burndown_chart: Burndown chart
+    story_points:
+      one: "%{count} story point"
+      other: "%{count} story points"
+    unassigned: Unassigned
+    user_preference:
+      header_backlogs: Backlogs module
+      button_update_backlogs: Update backlogs module
+    administration_blankslate:
+      title: Backlog admin settings are evolving
+      text: We are currently redesigning the Backlogs module. Admin settings for sprints and backlogs will be visible here in the near future. Project-level settings remain available.
+    bucket_component:
+      blankslate_title: Backlog bucket is empty
+      blankslate_description: Drag items here to add them.
+      label_actions: Backlog bucket actions
+      action_menu:
+        edit_backlog_bucket: Edit backlog bucket
+        delete_backlog_bucket: Delete backlog bucket
+    backlog_bucket_destroy_modal_component:
+      title: Delete backlog bucket?
+      details: The backlog bucket '%{name}' will be deleted and all work packages will be moved to the backlog inbox. No work package will be deleted.
+    sprint_component:
+      blankslate_title: "%{name} is empty"
+      blankslate_description: No items planned yet. Drag items here to add them.
+      label_actions: Sprint actions
+      label_start_sprint: Start
+      label_complete_sprint: Complete
+      start_sprint_disabled_reason_active_sprint: Another sprint is already active.
+      start_sprint_disabled_reason_missing_dates: Start and finish dates are required in order to start the sprint.
+      action_menu:
+        edit_sprint: Edit sprint
+        add_work_package: Add work package
+    inbox_component:
+      blankslate_title: Backlog inbox is empty
+      blankslate_description: All open work packages in this project will automatically appear here.
+      show_more:
+        one: Show 1 more item
+        other: Show %{count} more items
+    inbox_menu_component:
+      action_menu:
+        copy_url_to_clipboard: Copy URL to clipboard
+        copy_work_package_id: Copy work package ID
+        move_menu: Move
+      label_move_to_sprint: Move to sprint
+    move_to_sprint_dialog_component:
+      title: Move to sprint
+      label_sprint: Sprint
+    sprints_component:
+      blankslate:
+        title: No sprints present yet
+        settings_link_text: project settings
+        receive_and_manage_description_html: This project receives sprints from a different project. Manage this in the %{settings_link}.
+        receive_description_text: This project receives shared sprints from a different project, but none are available right now.
+        create_and_manage_description_html: To start planning your sprint, create one here or go to the %{settings_link} to receive sprints from a different project.
+        create_description_text: To start planning your sprint, create one here.
+        manage_description_html: To start planning your sprint, go to the %{settings_link} to receive sprints from a different project.
+        no_actions_description_text: No sprints are available for this project yet.
+    finish_sprint_dialog_component:
+      title: There are work in progress items
+      body: "%{message} What would you like to do with these?"
+      legend: Action for unfinished work packages
+      actions:
+        move_to_top_of_backlog: Move them to the top of the backlog
+        move_to_bottom_of_backlog: Move them to the bottom of the backlog
+        move_to_sprint: Move them to another sprint
+      select_sprint_label: Select sprint
+      button_complete_sprint: Complete sprint
+    story_menu_list_component:
+      action_menu:
+        copy_url_to_clipboard: Copy URL to clipboard
+        copy_work_package_id: Copy work package ID
+        move_menu: Move
+        move_to_sprint: Move to sprint
+    burndown_chart:
+      show:
+        blankslate_title: No burndown data available
+        blankslate_description: Set start and end date for the sprint to generate a burndown chart.
+  burndown:
+    story_points: Story points
+    story_points_ideal: Story points (ideal)
+  label_backlog: Backlog
+  label_backlog_bucket_edit: Edit backlog bucket
+  label_backlog_bucket_new: New backlog bucket
+  label_inbox: Inbox
+  label_backlogs: Backlogs
+  label_burndown_chart: Burndown chart
+  label_sprint_board: Sprint board
+  label_points_burn_down: Down
+  label_points_burn_up: Up
+  label_sprint_edit: Edit sprint
+  label_sprint_new: New sprint
+  label_backlog_and_sprints: Backlog and sprints
+  label_task_board: Task board
+  notice_successful_start: The sprint was started.
+  notice_successful_finish: The sprint was completed.
+  notice_unsuccessful_start: The sprint could not be started.
+  notice_unsuccessful_start_with_reason: 'The sprint could not be started: %{reason}'
+  notice_unsuccessful_finish: The sprint could not be completed.
+  notice_unsuccessful_finish_with_reason: 'The sprint could not be completed: %{reason}'
+  permission_create_sprints: Create sprints
+  permission_manage_sprint_items: Manage sprint items
+  permission_select_done_statuses: Select done statuses
+  permission_share_sprint: Share sprint
+  permission_start_complete_sprint: Start/complete sprint
+  permission_view_sprints: View sprints
+  project_module_backlogs: Backlogs
+  projects:
+    settings:
+      backlog_sharing:
+        options:
+          no_sharing:
+            label: Don't share
+            caption: Sprints created in this project will only be available and visible to this project. They will also not be visible to subprojects.
+          receive_shared:
+            label: Receive shared sprints
+            caption: This project can only use sprints shared by other projects.
+            warning: This project can only use sprints shared by other projects. Unused sprints created in this project in the past, will no longer be visible.
+          share_all_projects:
+            label: All projects
+            caption: Sprints created in this project will be available to all projects in this instance. If you select this option, it will no longer be available to other projects.
+            disabled_caption: Option not available since project "%{name}" is currently sharing with all projects and only one project can do this.
+            disabled_caption_anonymous: Option not available since another project is currently sharing with all projects and only one project can do this.
+          share_subprojects:
+            label: Subprojects
+            caption: Sprints created in this project will be available to all subprojects of the current project.
+            info: Sharing a sprint will share the name, status and the start and finish dates in all projects. These cannot be modified in projects that receive and use these sprints.
+        sprint_sharing: Share sprints
+  remaining_hours: remaining work
diff --git a/modules/backlogs/config/locales/crowdin/js-hy.yml b/modules/backlogs/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..414007315b4
--- /dev/null
+++ b/modules/backlogs/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,30 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    work_packages:
+      properties:
+        storyPoints: Story Points
+    burndown:
+      day: Day
+      points: Points
diff --git a/modules/backlogs/config/locales/crowdin/ru.yml b/modules/backlogs/config/locales/crowdin/ru.yml
index 9d3c8eabb00..10e3fd53df9 100644
--- a/modules/backlogs/config/locales/crowdin/ru.yml
+++ b/modules/backlogs/config/locales/crowdin/ru.yml
@@ -41,7 +41,7 @@ ru:
       user_preference:
         backlogs_versions_default_fold_state: Покажите спринты в свернутом виде
       work_package:
-        backlog_bucket: Сегмент бэклога
+        backlog_bucket: Раздел бэклога
         backlogs_work_package_type: Тип невыполненной работы
         position: Позиция
         sprint: Спринт
@@ -62,7 +62,7 @@ ru:
           attributes:
             base:
               unfinished_work_packages:
-                one: There is one work package that was not completed in this sprint.
+                one: Есть один пакет работ, который не был завершен в этом спринте.
                 few: Есть %{count} пакета работ, которые не были завершены в этом спринте.
                 many: Есть %{count} пакетов работ, которые не были завершены в этом спринте.
                 other: Есть %{count} пакетов работ, которые не были завершены в этом спринте.
@@ -70,7 +70,7 @@ ru:
             status:
               not_active: не активен, поэтому не может быть закрыт.
         work_package:
-          backlog_bucket_xor_sprint: не может быть назначен для спринта и для бэклога одновременно.
+          backlog_bucket_xor_sprint: не может быть назначен для спринта и для раздела бэклога одновременно.
           attributes:
             backlog_bucket:
               backlog_bucket_from_another_project: должен принадлежать тому же проекту, что и пакет работ.
@@ -119,15 +119,15 @@ ru:
       title: Настройки администрирования бэклога будут в будущем
       text: В настоящее время мы переделываем модуль Backlogs. В ближайшем будущем здесь появятся административные настройки для спринтов и бэклогов. Настройки на уровне проекта остаются доступными.
     bucket_component:
-      blankslate_title: Сегмент бэклога пуст
+      blankslate_title: Раздел бэклога пуст
       blankslate_description: Перетащите элементы сюда, чтобы добавить их.
-      label_actions: Действия с сегментом бэклога
+      label_actions: Действия с разделом бэклога
       action_menu:
-        edit_backlog_bucket: Редактировать сегмент бэклога
-        delete_backlog_bucket: Удалить сегмент бэклога
+        edit_backlog_bucket: Редактировать раздел бэклога
+        delete_backlog_bucket: Удалить раздел бэклога
     backlog_bucket_destroy_modal_component:
-      title: Удалить сегмент бэклога?
-      details: Сегмент бэклога '%{name}' будет удалён, а все пакеты работ будут перемещены в папку "Входящие" бэклога. Ни один пакет работ не будет удален.
+      title: Удалить раздел бэклога?
+      details: Раздел бэклога '%{name}' будет удалён, а все пакеты работ будут перемещены в папку "Входящие" бэклога. Ни один пакет работ не будет удален.
     sprint_component:
       blankslate_title: "%{name} пустой"
       blankslate_description: Пока ничего не запланировано. Перетащите элементы сюда, чтобы добавить их.
@@ -190,8 +190,8 @@ ru:
     story_points: Точки истории
     story_points_ideal: Точки истории (идеально)
   label_backlog: Бэклог
-  label_backlog_bucket_edit: Редактировать сегмент бэклога
-  label_backlog_bucket_new: Новый сегмент бэклога
+  label_backlog_bucket_edit: Редактировать раздел бэклога
+  label_backlog_bucket_new: Новый раздел бэклога
   label_inbox: Входящие
   label_backlogs: Бэклоги
   label_burndown_chart: Сводная таблица
diff --git a/modules/backlogs/config/locales/crowdin/tr.yml b/modules/backlogs/config/locales/crowdin/tr.yml
index 4b822b032fc..4dc918eb4d0 100644
--- a/modules/backlogs/config/locales/crowdin/tr.yml
+++ b/modules/backlogs/config/locales/crowdin/tr.yml
@@ -27,43 +27,43 @@ tr:
   activerecord:
     attributes:
       project:
-        sprint_sharing: Sprint sharing
+        sprint_sharing: Koşu paylaşımı
       sprint:
-        duration: Duration
-        finish_date: Finish date
-        goal: Sprint goal
-        name: Sprint name
-        sharing: Sharing
+        duration: Süre
+        finish_date: Bitiş tarihi
+        goal: Hızlı görev hedefi
+        name: Koşu Adı
+        sharing: Paylaşım
         statuses:
-          in_planning: In planning
-          active: Active
-          completed: Completed
+          in_planning: Planlanıyor
+          active: Aktif
+          completed: Tamamlandı
       user_preference:
         backlogs_versions_default_fold_state: Show sprints folded
       work_package:
-        backlog_bucket: Backlog Bucket
+        backlog_bucket: Birikmiş İş Havuzu
         backlogs_work_package_type: Bekleme listesi türü
         position: Konum
-        sprint: Sprint
+        sprint: Koşu
         story_points: Hikaye Puanları
     errors:
       messages:
-        must_be_in_planning: must be in planning to start.
+        must_be_in_planning: başlamak için planlama aşamasında olmalıdır.
         only_one_active_sprint_allowed: proje başına yalnızca bir aktif sprint'e izin verilir.
-        dates_required: Start and finish dates are required in order to start the sprint.
+        dates_required: Koşu başlatmak için başlangıç ve bitiş tarihleri zorunludur.
       models:
         project:
-          receiving_sprints: is receiving shared sprints. Own sprints cannot be created.
+          receiving_sprints: paylaşılan sprintleri alıyor. Kendi sprintleriniz oluşturulamaz.
           attributes:
             sprint_sharing:
-              share_all_projects_already_taken: cannot be set because project "%{name}" is already sharing with all projects.
-              share_all_projects_already_taken_anonymous: cannot be set because another project is already sharing with all projects.
+              share_all_projects_already_taken: '"%{name}" projesi zaten tüm projelerle paylaşıldığı için ayarlanamaz.'
+              share_all_projects_already_taken_anonymous: halihazırda başka bir proje tüm projelerle paylaşıldığından bu ayar yapılamaz.
         sprint:
           attributes:
             base:
               unfinished_work_packages:
                 one: There is one work package that was not completed in this sprint.
-                other: There are %{count} work packages that were not completed in this sprint.
+                other: Bu sprint bünyesinde tamamlanmamış %{count} adet iş paketi bulunmaktadır.
               format: "%{message}"
             status:
               not_active: is not active so it cannot be closed.
diff --git a/modules/backlogs/lib/open_project/backlogs/engine.rb b/modules/backlogs/lib/open_project/backlogs/engine.rb
index 5906e6ae7a5..b60b8e85244 100644
--- a/modules/backlogs/lib/open_project/backlogs/engine.rb
+++ b/modules/backlogs/lib/open_project/backlogs/engine.rb
@@ -86,7 +86,7 @@ module OpenProject::Backlogs
                      "backlogs/inbox": %i[move reorder move_to_sprint_dialog] },
                    permissible_on: :project,
                    require: :member,
-                   dependencies: :view_sprints
+                   dependencies: %i[view_sprints edit_work_packages]
 
         permission :share_sprint,
                    { "projects/settings/backlog_sharings": %i[show update] },
diff --git a/modules/backlogs/spec/components/backlogs/bucket_component_spec.rb b/modules/backlogs/spec/components/backlogs/bucket_component_spec.rb
index 29e14317e1c..31999c1b46f 100644
--- a/modules/backlogs/spec/components/backlogs/bucket_component_spec.rb
+++ b/modules/backlogs/spec/components/backlogs/bucket_component_spec.rb
@@ -89,8 +89,7 @@ RSpec.describe Backlogs::BucketComponent, type: :component do
         expect(rendered_component).to have_css(
           ".Counter",
           text: "1",
-          aria: { label: I18n.t("open_project.common.work_package_card_list_component.header.label_work_package_count",
-                                count: 1) }
+          aria: { label: I18n.t(:label_x_work_packages, count: 1), live: "polite" }
         )
       end
 
diff --git a/modules/backlogs/spec/components/backlogs/inbox_component_spec.rb b/modules/backlogs/spec/components/backlogs/inbox_component_spec.rb
index 0e362579e57..09c17f7c472 100644
--- a/modules/backlogs/spec/components/backlogs/inbox_component_spec.rb
+++ b/modules/backlogs/spec/components/backlogs/inbox_component_spec.rb
@@ -69,6 +69,10 @@ RSpec.describe Backlogs::InboxComponent, type: :component do
         expect(box["data-target-allowed-drag-type"]).to eq("story")
       end
     end
+
+    it "announces dynamic empty-state updates" do
+      expect(page).to have_role(:status, aria: { live: "polite" })
+    end
   end
 
   describe "empty state" do
diff --git a/modules/backlogs/spec/components/backlogs/sprint_component_spec.rb b/modules/backlogs/spec/components/backlogs/sprint_component_spec.rb
index d35f6ddea96..9fafa5ff4e7 100644
--- a/modules/backlogs/spec/components/backlogs/sprint_component_spec.rb
+++ b/modules/backlogs/spec/components/backlogs/sprint_component_spec.rb
@@ -79,6 +79,14 @@ RSpec.describe Backlogs::SprintComponent, type: :component do
         expect(rendered_component).to have_text("8 points", normalize_ws: true)
       end
 
+      it "renders the inferred work-package count in the header" do
+        expect(rendered_component).to have_css(
+          ".Counter",
+          text: "2",
+          aria: { label: I18n.t(:label_x_work_packages, count: 2), live: "polite" }
+        )
+      end
+
       it "renders story points on each work package card" do
         expect(rendered_component).to have_css("span", text: "5", aria: { hidden: true })
         expect(rendered_component).to have_css(".sr-only", text: "5 story points")
diff --git a/modules/backlogs/spec/components/backlogs/work_package_card_list_component_spec.rb b/modules/backlogs/spec/components/backlogs/work_package_card_list_component_spec.rb
new file mode 100644
index 00000000000..d9246595ff8
--- /dev/null
+++ b/modules/backlogs/spec/components/backlogs/work_package_card_list_component_spec.rb
@@ -0,0 +1,313 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe Backlogs::WorkPackageCardListComponent, type: :component do
+  include Rails.application.routes.url_helpers
+
+  shared_let(:type_feature) { create(:type_feature) }
+  shared_let(:default_status) { create(:default_status) }
+  shared_let(:default_priority) { create(:default_priority) }
+  shared_let(:user) { create(:admin) }
+  current_user { user }
+
+  shared_let(:project) { create(:project, types: [type_feature]) }
+  shared_let(:sprint) do
+    create(:sprint, project:, name: "Sprint 1",
+                    start_date: Date.yesterday, finish_date: Date.tomorrow)
+  end
+  shared_let(:backlog_bucket) { create(:backlog_bucket, project:, name: "Bucket A") }
+
+  let(:container) { sprint }
+  let(:drag_and_drop) { nil }
+  let(:params) { {} }
+  let(:work_packages) { [] }
+  let(:header_arguments) { nil }
+  let(:footer_content) { nil }
+
+  subject(:rendered_component) do
+    render_component(work_packages:, container:, drag_and_drop:)
+  end
+
+  def render_component(work_packages:, container:, drag_and_drop:)
+    render_inline(
+      described_class.new(
+        work_packages:,
+        project:,
+        container:,
+        drag_and_drop:,
+        params:,
+        current_user: user
+      )
+    ) do |box|
+      box.with_header(**header_arguments) if header_arguments
+      box.with_empty_state(title: "Sprint 1 is empty", description: "Drag work packages here")
+      box.with_footer { footer_content } if footer_content
+    end
+  end
+
+  describe "automatic work_packages iteration" do
+    let(:work_packages) do
+      [
+        create(:work_package, subject: "WP A", project:, type: type_feature, status: default_status,
+                              priority: default_priority, sprint:, position: 1),
+        create(:work_package, subject: "WP B", project:, type: type_feature, status: default_status,
+                              priority: default_priority, sprint:, position: 2)
+      ]
+    end
+
+    it_behaves_like "rendering Box", row_count: 2, header: false, footer: false
+
+    it "renders one row per work package" do
+      expect(rendered_component).to have_text("WP A")
+      expect(rendered_component).to have_text("WP B")
+    end
+  end
+
+  describe "hardcoded Backlogs item component" do
+    let(:work_packages) do
+      [
+        create(:work_package, subject: "Story card", project:, type: type_feature,
+                              status: default_status, priority: default_priority,
+                              sprint:, position: 1, story_points: 3)
+      ]
+    end
+
+    it "renders items through Backlogs::WorkPackageCardListItemComponent" do
+      work_package = work_packages.first
+
+      expect(rendered_component).to have_css(
+        ".Box-row#work_package_#{work_package.id}[data-controller='backlogs--story']"
+      )
+    end
+
+    it "renders Backlogs-specific row data attributes" do
+      work_package = work_packages.first
+
+      expect(rendered_component).to have_css(".Box-row#work_package_#{work_package.id}") do |row|
+        expect(row["data-story"]).to be_present
+        expect(row["data-backlogs--story-id-value"]).to eq(work_package.id.to_s)
+      end
+    end
+
+    it "renders the Backlogs work-package card" do
+      work_package = work_packages.first
+
+      expect(rendered_component).to have_css(
+        ".Box-row#work_package_#{work_package.id} .sr-only",
+        text: "3 story points"
+      )
+      expect(rendered_component).to have_element(
+        "include-fragment",
+        src: menu_project_backlogs_work_package_path(project, sprint, work_package)
+      )
+    end
+  end
+
+  describe "delegated header with fold-state defaults" do
+    let(:header_arguments) { { title: "Sprint 1", count: 0 } }
+
+    it "renders the header" do
+      expect(rendered_component).to have_css(".Box-header")
+    end
+
+    it "renders the provided title" do
+      expect(rendered_component).to have_heading "Sprint 1", level: 4
+    end
+
+    it "announces dynamic counter updates" do
+      expect(rendered_component).to have_css(
+        ".Counter",
+        aria: { label: I18n.t(:label_x_work_packages, count: 0), live: "polite" },
+        visible: :all
+      )
+    end
+
+    context "with work packages" do
+      let(:header_arguments) { { title: "Sprint 1" } }
+      let(:work_packages) do
+        [
+          create(:work_package, project:, type: type_feature, status: default_status,
+                                priority: default_priority, sprint:, position: 1),
+          create(:work_package, project:, type: type_feature, status: default_status,
+                                priority: default_priority, sprint:, position: 2)
+        ]
+      end
+
+      it "infers the count from the rendered work packages" do
+        expect(rendered_component).to have_css(
+          ".Counter",
+          text: "2",
+          aria: { label: I18n.t(:label_x_work_packages, count: 2) }
+        )
+      end
+    end
+
+    context "when the count is disabled" do
+      let(:header_arguments) { { title: "Sprint 1", count: false } }
+      let(:work_packages) do
+        [
+          create(:work_package, project:, type: type_feature, status: default_status,
+                                priority: default_priority, sprint:, position: 1)
+        ]
+      end
+
+      it "does not render the count" do
+        expect(rendered_component).to have_no_css(".Counter")
+      end
+    end
+
+    context "when the count label is overridden" do
+      let(:header_arguments) do
+        { title: "Sprint 1", count: 7, count_label: "7 backlog stories" }
+      end
+
+      it "renders the provided count and accessible label" do
+        expect(rendered_component).to have_css(
+          ".Counter",
+          text: "7",
+          aria: { label: "7 backlog stories" }
+        )
+      end
+    end
+  end
+
+  describe "delegated footer" do
+    let(:footer_content) { "footer-content" }
+
+    it "renders the footer when supplied" do
+      expect(rendered_component).to have_text("footer-content")
+    end
+  end
+
+  describe "empty_state rendering" do
+    it_behaves_like "rendering Blank Slate", heading: "Sprint 1 is empty"
+
+    it "renders the blankslate when work_packages is empty" do
+      expect(rendered_component).to have_text("Sprint 1 is empty")
+      expect(rendered_component).to have_text("Drag work packages here")
+    end
+
+    it "announces dynamic empty-state updates" do
+      expect(rendered_component).to have_role(:status, aria: { live: "polite" })
+    end
+
+    context "when work_packages is nil" do
+      let(:work_packages) { nil }
+
+      it "treats nil as an empty collection" do
+        expect(rendered_component).to have_text("Sprint 1 is empty")
+        expect(rendered_component).to have_text("Drag work packages here")
+      end
+    end
+
+    context "when there are work packages" do
+      let(:work_packages) do
+        [
+          create(:work_package, project:, type: type_feature, status: default_status,
+                                priority: default_priority, sprint:, position: 1)
+        ]
+      end
+
+      it "does not render the blankslate" do
+        expect(rendered_component).to have_no_css(".blankslate")
+      end
+    end
+  end
+
+  describe "empty_state validation" do
+    it "raises ArgumentError when work_packages is empty and no empty_state given" do
+      expect do
+        render_inline(
+          described_class.new(
+            work_packages: [],
+            project:,
+            container: sprint,
+            current_user: user
+          )
+        ) do |box|
+          box.with_footer { "" }
+        end
+      end.to raise_error(ArgumentError, /empty_state slot is required/)
+    end
+  end
+
+  describe "drag-and-drop data merging" do
+    context "without drag_and_drop" do
+      it "does not emit drag-and-drop data" do
+        expect(rendered_component).to have_no_css(".Box[data-generic-drag-and-drop-target]")
+        expect(rendered_component).to have_no_css(".Box[data-target-id]")
+        expect(rendered_component).to have_no_css(".Box[data-target-allowed-drag-type]")
+      end
+    end
+
+    context "with drag_and_drop configured" do
+      let(:drag_and_drop) do
+        { target_id: "sprint:#{sprint.id}", allowed_drag_type: "story" }
+      end
+
+      it "merges drag-and-drop data attributes onto the box" do
+        expect(rendered_component).to have_css(".Box") do |box|
+          expect(box["data-generic-drag-and-drop-target"]).to eq("container")
+          expect(box["data-target-container-accessor"]).to eq(":scope > ul")
+          expect(box["data-target-id"]).to eq("sprint:#{sprint.id}")
+          expect(box["data-target-allowed-drag-type"]).to eq("story")
+        end
+      end
+    end
+  end
+
+  describe "container/list/header DOM IDs" do
+    context "when container is a Sprint" do
+      let(:container) { sprint }
+
+      it "uses dom_target(sprint) as the box id" do
+        expect(rendered_component).to have_css(".Box#sprint_#{sprint.id}")
+      end
+
+      it "uses dom_target(sprint, :list) for the list id" do
+        expect(rendered_component).to have_css("ul#sprint_#{sprint.id}_list")
+      end
+    end
+
+    context "when container is a BacklogBucket" do
+      let(:container) { backlog_bucket }
+
+      it "uses dom_target(backlog_bucket) as the box id" do
+        expect(rendered_component).to have_css(".Box#backlog_bucket_#{backlog_bucket.id}")
+      end
+
+      it "uses dom_target(backlog_bucket, :list) for the list id" do
+        expect(rendered_component).to have_css("ul#backlog_bucket_#{backlog_bucket.id}_list")
+      end
+    end
+  end
+end
diff --git a/modules/backlogs/spec/components/backlogs/work_package_card_list_item_component_spec.rb b/modules/backlogs/spec/components/backlogs/work_package_card_list_item_component_spec.rb
index 2e9558c5783..ba0f64609bd 100644
--- a/modules/backlogs/spec/components/backlogs/work_package_card_list_item_component_spec.rb
+++ b/modules/backlogs/spec/components/backlogs/work_package_card_list_item_component_spec.rb
@@ -76,9 +76,9 @@ RSpec.describe Backlogs::WorkPackageCardListItemComponent, type: :component do
         backlogs__story_id_value: work_package.id,
         backlogs__story_display_id_value: work_package.display_id,
         backlogs__story_full_url_value: work_package_path(work_package),
-        backlogs__story_selected_class: "Box-row--blue",
-        test_selector: "work-package-#{work_package.id}"
+        backlogs__story_selected_class: "Box-row--blue"
       )
+      expect(item.row_args[:test_selector]).to eq("work-package-#{work_package.id}")
     end
 
     it "marks the row as draggable for users allowed to manage sprint items" do
diff --git a/modules/backlogs/spec/lib/open_project/backlogs/permissions_spec.rb b/modules/backlogs/spec/lib/open_project/backlogs/permissions_spec.rb
index bcd6efe56e9..a9730b56fdc 100644
--- a/modules/backlogs/spec/lib/open_project/backlogs/permissions_spec.rb
+++ b/modules/backlogs/spec/lib/open_project/backlogs/permissions_spec.rb
@@ -74,8 +74,8 @@ RSpec.describe OpenProject::AccessControl, "Backlogs module permissions" do # ru
   describe "manage_sprint_items" do
     subject { described_class.permission(:manage_sprint_items) }
 
-    it "depends on view_sprints, add_work_packages, and edit_work_packages" do
-      expect(subject.dependencies).to contain_exactly(:view_sprints)
+    it "depends on view_sprints and edit_work_packages" do
+      expect(subject.dependencies).to contain_exactly(:view_sprints, :edit_work_packages)
     end
   end
 
diff --git a/modules/backlogs/spec/support/pages/backlog.rb b/modules/backlogs/spec/support/pages/backlog.rb
index 0ad8734100f..294a0f702c0 100644
--- a/modules/backlogs/spec/support/pages/backlog.rb
+++ b/modules/backlogs/spec/support/pages/backlog.rb
@@ -350,10 +350,7 @@ module Pages
       within_backlog_bucket(bucket) do
         expect(page).to have_css(
           ".Counter",
-          accessible_name: I18n.t(
-            "open_project.common.work_package_card_list_component.header.label_work_package_count",
-            count:
-          )
+          accessible_name: I18n.t(:label_x_work_packages, count:)
         )
       end
     end
@@ -470,16 +467,13 @@ module Pages
       within(sprint_selector(sprint)) do
         expect(page).to have_css(
           ".Counter",
-          accessible_name: I18n.t(
-            "open_project.common.work_package_card_list_component.header.label_work_package_count",
-            count:
-          )
+          accessible_name: I18n.t(:label_x_work_packages, count:)
         )
       end
     end
 
     def expect_and_dismiss_error(message)
-      expect(page).to have_content message
+      expect(page).to have_text message
 
       click_on "Cancel"
     end
diff --git a/modules/bim/config/locales/crowdin/hy.seeders.yml b/modules/bim/config/locales/crowdin/hy.seeders.yml
new file mode 100644
index 00000000000..96e93347a61
--- /dev/null
+++ b/modules/bim/config/locales/crowdin/hy.seeders.yml
@@ -0,0 +1,734 @@
+#This file has been generated by script/i18n/generate_seeders_i18n_source_file.
+#Please do not edit directly.
+#This file is part of the sources sent to crowdin for translation.
+---
+hy:
+  seeds:
+    bim:
+      priorities:
+        item_0:
+          name: Low
+        item_1:
+          name: Normal
+        item_2:
+          name: High
+        item_3:
+          name: Critical
+      statuses:
+        item_0:
+          name: New
+        item_1:
+          name: In progress
+        item_2:
+          name: Resolved
+        item_3:
+          name: Closed
+      time_entry_activities:
+        item_0:
+          name: Management
+        item_1:
+          name: Specification
+        item_2:
+          name: Other
+      types:
+        item_0:
+          name: Task
+        item_1:
+          name: Milestone
+        item_2:
+          name: Phase
+        item_3:
+          name: Issue
+        item_4:
+          name: Remark
+        item_5:
+          name: Request
+        item_6:
+          name: Clash
+      global_queries:
+        item_0:
+          name: 'Embedded table: Children'
+      type_configuration:
+        item_0:
+          form_configuration:
+            item_0:
+              group_name: Children
+      groups:
+        item_0:
+          name: Architects
+        item_1:
+          name: BIM Coordinators
+        item_2:
+          name: BIM Managers
+        item_3:
+          name: BIM Modellers
+        item_4:
+          name: Lead BIM Coordinators
+        item_5:
+          name: MEP Engineers
+        item_6:
+          name: Planners
+        item_7:
+          name: Structural Engineers
+      welcome:
+        title: Welcome to OpenProject BIM edition!
+        text: |
+          Checkout the demo projects to get started with some examples.
+
+          * [(Demo) Construction project]({{opSetting:base_url}}/projects/demo-construction-project): Planning, BIM process, BCF management, and constructing, all at a glance.
+              * [(Demo) Planning & constructing]({{opSetting:base_url}}/projects/demo-planning-constructing-project): Classical planning and construction management.
+              * [(Demo) Bim project]({{opSetting:base_url}}/projects/demo-bim-project): BIM process and coordination.
+                  * [(Demo) BCF management]({{opSetting:base_url}}/projects/demo-bcf-management-project): BCF management.
+
+          Also, you can create a blank [new project]({{opSetting:base_url}}/projects/new).
+
+          Never stop collaborating. With open source and open mind.
+
+          You can change this welcome text [here]({{opSetting:base_url}}/admin/settings/general).
+      projects:
+        demo-construction-project:
+          name: "(Demo) Construction project"
+          status_explanation: All tasks and the sub-projects are on schedule. The people involved know their tasks. The system is completely set up.
+          description: This is a short summary of the goals of this demo construction project.
+          news:
+            item_0:
+              title: Welcome to your demo project
+              summary: |
+                We are glad you joined.
+                In this module you can communicate project news to your team members.
+              description: The actual news
+          categories:
+            item_0: Category 1 (to be changed in Project settings)
+          queries:
+            item_0:
+              name: Project plan
+            item_1:
+              name: Milestones
+            item_2:
+              name: Tasks
+            item_3:
+              name: Team planner
+          boards:
+            bcf:
+              name: Simple drag'n drop workflow
+          project-overview:
+            widgets:
+              item_0:
+                options:
+                  name: Welcome
+              item_1:
+                options:
+                  name: Getting started
+                  text: |
+                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+
+                    But before you jump right into it, you should know that this exemplary project is split up into two different projects:
+
+                    1.  [Construction project]({{opSetting:base_url}}/projects/demo-planning-constructing-project): Here you will find the classical roles, some workflows and work packages for your construction project.
+                    2.  [Creating BIM Model]({{opSetting:base_url}}/projects/demo-bim-project): This project also offers roles, workflows and work packages but especially in the BIM context.
+
+                    _Try the following steps:_
+
+                    1.  _Invite new members to your project_: → Go to [Members]({{opSetting:base_url}}/projects/demo-construction-project/members) in the project navigation.
+                    2.  _View the work in your projects_: → Go to [Work packages]({{opSetting:base_url}}/projects/demo-construction-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
+                    3.  _Create a new work package_: → Go to [Work packages → Create]({{opSetting:base_url}}/projects/demo-construction-project/work_packages/new?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D&type=11).
+                    4.  _Create and update a Gantt chart_: → Go to [Gantt chart]({{opSetting:base_url}}/projects/demo-construction-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22assignee%22%2C%22responsible%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
+                    5.  _Activate further modules_: → Go to [Project settings → Modules]({{opSetting:base_url}}/projects/demo-construction-project/settings/modules).
+                    6.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages]({{opSetting:base_url}}/projects/demo-construction-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
+                    7.  _Agile working? Check out our brand new boards:_ → Go to [Boards]({{opSetting:base_url}}/projects/demo-construction-project/boards)
+
+                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
+                    Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
+              item_4:
+                options:
+                  name: Members
+              item_5:
+                options:
+                  name: Work packages
+              item_6:
+                options:
+                  name: Milestones
+        demo-planning-constructing-project:
+          name: "(Demo) Planning & constructing"
+          status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
+          description: This is a short summary of the goals of this demo planning and constructing project.
+          news:
+            item_0:
+              title: Welcome to your demo project
+              summary: |
+                We are glad you joined.
+                In this module you can communicate project news to your team members.
+              description: The actual news
+          categories:
+            item_0: Category 1 (to be changed in Project settings)
+          queries:
+            item_0:
+              name: Project plan
+            item_1:
+              name: Milestones
+            item_2:
+              name: Tasks
+            item_3:
+              name: Team planner
+          project-overview:
+            widgets:
+              item_0:
+                options:
+                  name: Welcome
+              item_1:
+                options:
+                  name: Getting started
+                  text: |
+                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+
+                    Here you will find the classical roles, some workflows and work packages for your construction project.
+
+                    _Try the following steps:_
+
+                    1.  _Invite new members to your project:_ → Go to [Members]({{opSetting:base_url}}/projects/demo-planning-constructing-project/members) in the project navigation.
+                    2.  _View the work in your projects:_ → Go to [Work packages]({{opSetting:base_url}}/projects/demo-planning-constructing-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
+                    3.  _Create a new work package:_ → Go to [Work packages → Create]({{opSetting:base_url}}/projects/demo-planning-constructing-project/work_packages/new?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D&type=11).
+                    4.  _Create and update a Gantt chart:_ → Go to [Gantt chart]({{opSetting:base_url}}/projects/demo-planning-constructing-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22assignee%22%2C%22responsible%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
+                    5.  _Activate further modules:_ → Go to [Project settings → Modules]({{opSetting:base_url}}/projects/demo-planning-constructing-project/settings/modules).
+                    6.  _Working agile? Create a new board:_ → Go to [Boards]({{opSetting:base_url}}/projects/demo-planning-constructing-project/boards)
+
+                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
+                    Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
+              item_4:
+                options:
+                  name: Members
+              item_5:
+                options:
+                  name: Work packages
+              item_6:
+                options:
+                  name: Milestones
+          work_packages:
+            item_0:
+              subject: Project kick off construction project
+              description: |-
+                The project kick off initializes the start of the project in your company. Everybody being part of this project should be invited to the kick off for a first briefing.
+
+                The next step could be checking out the timetable and adjusting the appointments, by looking at the [Gantt chart]({{opSetting:base_url}}/projects/demo-construction-project/work_packages?query_props=%7B%22c%22%3A%5B%22id%22%2C%22subject%22%2C%22startDate%22%2C%22dueDate%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22status%22%2C%22o%22%3A%22o%22%2C%22v%22%3A%5B%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%7D).
+            item_1:
+              subject: Basic evaluation
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Gathering first project information
+                  description: |-
+                    ## Goal
+
+                    *   Define tasks based on the customer needs
+                    *   Time frame and cost estimation shall be defined
+
+                    ## Description
+
+                    *   Identify the customer needs by having a workshop with him/ her
+                    *   Each need shall represent a task with its corresponding work packages
+                    *   Derive the cost estimation and time frame
+                item_1:
+                  subject: Summarize the results
+                  description: |-
+                    ## Goal
+
+                    *   Create a useful overview of the results
+                    *   Check what has been done and summarize the results
+                    *   Communicate all the relevant results with the customer
+                    *   Identify the fundamental boundary conditions of the project
+
+                    ## Description
+
+                    *   Each topic gets its own overview which will be used as a catalogue of results
+                    *   This overview informs all participants about the decisions made
+                    *   ...
+                item_2:
+                  subject: End of basic evaluation
+                  description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_2:
+              subject: Preliminary planning
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Developing first draft
+                  description: |-
+                    ## Goal
+
+                    *   Create a useful overview of the results
+                    *   Check what has been done and summarize the results
+                    *   Communicate all the relevant results with the customer
+                    *   Identify the fundamental boundary conditions of the project
+
+                    ## Description
+
+                    *   Each topic gets its own overview which will be used as a catalogue of results
+                    *   This overview informs all participants about the decisions made
+                    *   ...
+                item_1:
+                  subject: Summarize results
+                  description: |-
+                    ## Goal
+
+                    *   Create a useful overview of the results
+                    *   Check what has been done and summarize the results
+                    *   Communicate all the relevant results with the customer
+                    *   Identify the fundamental boundary conditions of the project
+
+                    ## Description
+
+                    *   Each topic gets its own overview which will be used as a catalogue of results
+                    *   This overview informs all participants about the decisions made
+                    *   ...
+            item_3:
+              subject: Passing of preliminary planning
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_4:
+              subject: Design planning
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Finishing design
+                  description: |-
+                    ## Goal
+
+                    *   Design is done
+                    *   All parties are happy with the results of the design planning phase
+
+                    ## Description
+
+                    *   The design of the project will be finished
+                    *   All parties agree on the design
+                    *   The owner is happy with the results
+                    *   ...
+                item_1:
+                  subject: Design freeze
+                  description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_5:
+              subject: Construction phase
+              children:
+                item_0:
+                  subject: Start constructing
+                  description: |-
+                    ## Goal
+
+                    *   Ground breaking ceremony
+                    *   Setting up the construction site
+                    *   ...
+
+                    ## Description
+
+                    *   Preparing the site for the project
+                    *   Get the team together
+                    *   ...
+                item_1:
+                  subject: Foundation
+                  description: |-
+                    ## Goal
+
+                    *   Laying of the foundation stone
+                    *   ...
+
+                    ## Description
+
+                    *   Setting up the concrete mixer
+                    *   Setting up the supply chain for the concrete
+                    *   ...
+                item_2:
+                  subject: Building construction
+                  description: |-
+                    ## Goal
+
+                    *   Topping out ceremony
+                    *   Walls and ceilings are done
+                    *   ...
+
+                    ## Description
+
+                    *   Creating all structural levels of the building
+                    *   Installing doors and windows
+                    *   Finishing the roof structure
+                    *   ...
+                item_3:
+                  subject: Finishing the facade
+                  description: |-
+                    ## Goal
+
+                    *   Facade is done
+                    *   Whole building is waterproof
+                    *   ...
+
+                    ## Description
+
+                    *   Install all elements for the facade
+                    *   Finish the roof
+                    *   ...
+                item_4:
+                  subject: Installing the building service systems
+                  description: |-
+                    ## Goal
+
+                    *   All building service systems are ready to be used
+
+                    ## Description
+
+                    *   Installing the heating system
+                    *   Installing the climate system
+                    *   Electrical installation
+                    *   ...
+                item_5:
+                  subject: Final touches
+                  description: |-
+                    ## Goal
+
+                    *   Handover of the keys
+                    *   The customer is happy with his building
+                    *   ...
+
+                    ## Description
+
+                    *   Finishing the installation of the building service systems
+                    *   Finishing the interior construction
+                    *   Finishing the facade
+                    *   ...
+                item_6:
+                  subject: House warming party
+                  description: |-
+                    ## Goal
+
+                    *   Have a blast!
+
+                    ## Description
+
+                    *   Invite the construction team
+                    *   Invite your friends
+                    *   Bring some drinks, snacks and your smile
+        demo-bim-project:
+          name: "(Demo) BIM project"
+          status_explanation: All tasks and sub-projects are on schedule. The people involved know their tasks. The system is completely set up.
+          description: This is a short summary of the goals of this demo BIM project.
+          news:
+            item_0:
+              title: Welcome to your demo project
+              summary: |
+                We are glad you joined.
+                In this module you can communicate project news to your team members.
+              description: The actual news
+          categories:
+            item_0: Category 1 (to be changed in Project settings)
+          queries:
+            item_0:
+              name: Project plan
+            item_1:
+              name: Milestones
+            item_2:
+              name: Tasks
+            item_3:
+              name: Team planner
+          project-overview:
+            widgets:
+              item_0:
+                options:
+                  name: Welcome
+              item_1:
+                options:
+                  name: Getting started
+                  text: |
+                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+
+                    This demo project offers roles, workflows and work packages that are specialized for BIM.
+
+                    _Try the following steps:_
+
+                    1.  _Invite new members to your project:_ → Go to [Members]({{opSetting:base_url}}/projects/demo-bim-project/members) in the project navigation.
+                    2.  _Upload and view 3D-models in IFC format:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) in the project navigation.
+                    3.  _Create and manage BCF issues linked directly in the IFC model:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) → Create.
+                    4.  _View the work in your projects:_ → Go to [Work packages]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
+                    5.  _Create a new work package:_ → Go to [Work packages → Create]({{opSetting:base_url}}/projects/demo-bim-project/work_packages/new?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D&type=11).
+                    6.  _Create and update a Gantt chart:_ → Go to [Gantt chart]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22assignee%22%2C%22responsible%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
+                    7.  _Activate further modules:_ → Go to [Project settings → Modules]({{opSetting:base_url}}/projects/demo-bim-project/settings/modules).
+                    8.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
+                    9.  _Working agile? Create a new board:_ → Go to [Boards]({{opSetting:base_url}}/projects/demo-bim-project/boards)
+
+                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
+                    Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
+              item_4:
+                options:
+                  name: Members
+              item_5:
+                options:
+                  name: Work packages
+              item_6:
+                options:
+                  name: Milestones
+          work_packages:
+            item_0:
+              subject: Project kick off creating BIM model
+              description: |-
+                The project Kickoff initializes the start of the project in your company. The whole project team should be invited to the Kickoff for a first briefing.
+
+                The next step could be to check out the timetable and adjusting the appointments, by looking at the [Gantt chart]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22id%22%2C%22subject%22%2C%22startDate%22%2C%22dueDate%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22status%22%2C%22o%22%3A%22o%22%2C%22v%22%3A%5B%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%7D).
+            item_1:
+              subject: Project preparation
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Gathering the project specific data and information for the BIM model
+                  description: |-
+                    ## Goal
+
+                    *   Identify the information strategy for the customer (e.g. by using plain language questions)
+                    *   If provided, analyze the customer information requirements for the BIM model
+                    *   Define an information delivery strategy according to the customers needs
+
+                    ## Description
+
+                    *   Analyzing the customers needs and goals for using the BIM methodology
+                    *   Results of this tasks should be:
+                    *   The requirements for the project
+                    *   A strategy for the delivery phase
+                    *   ...
+                item_1:
+                  subject: Creating the BIM execution plan
+                  description: |-
+                    # Goal
+
+                    *   A BIM execution plan will be defined according to the exchange requirements specifications (ERS)
+                    *   All team members and partners have a plan on how to reach each of the project goals
+
+                    # Description
+
+                    *   Depending on the identifies use cases, the individual Information Delivery Manuals will be defined
+                    *   To handle the technological interfaces, a software topology will be defined and analyzed and verified
+                    *   ...
+                item_2:
+                  subject: Completion of the BIM execution plan
+                  description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_2:
+              subject: End of preparation phase
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_3:
+              subject: Creating initial BIM model
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Modelling initial BIM model
+                  description: |-
+                    # Goal
+
+                    *   Modelling the initial BIM model
+                    *   Creating a BIM model for the whole project team
+
+                    # Description
+
+                    *   According to the gathered data from the customer, the initial model will be modelled
+                    *   The model shall be modelled according to the LOD Matrices and contain the information needed
+                    *   ...
+                item_1:
+                  subject: Initial, internal model check and revising
+                  description: |-
+                    # Goal
+
+                    *   Submitting a BIM model according to the defined standards
+
+                    # Description
+
+                    *   The model shall be checked, according to the defined standards (conventions, LOD, ...) and revised
+                    *   ...
+                item_2:
+                  subject: Submitting initial BIM model
+                  description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_4:
+              subject: Modelling, first cycle
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Referencing external BIM models
+                  description: |-
+                    # Goal
+
+                    *   Having a foundation for developing the internal model/ offering answers
+                    *   Using the external model to develop the internal model
+
+                    # Description
+
+                    *   The external model will be referenced in the BIM platform, thus used for modelling the internal model
+                    *   ...
+                item_1:
+                  subject: Modelling the BIM model
+                  description: |-
+                    # Goal
+
+                    *   Creating a BIM model for the project
+                    *   Creating a BIM model for the whole project team
+
+                    # Description
+
+                    *   The model will be created according to the BIM execution plan
+                    *   ...
+                item_2:
+                  subject: First Cycle, internal model check and revising
+                  description: |-
+                    # Goal
+
+                    *   Submitting a BIM model according to the defined standards
+
+                    # Description
+
+                    *   The model shall be checked, according to the defined standards (conventions, LOD, ...) and revised.
+                    *   ...
+                item_3:
+                  subject: Submitting BIM model
+                  description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_5:
+              subject: Coordination, first cycle
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+              children:
+                item_0:
+                  subject: Coordinate the different BIM models
+                  description: |-
+                    # Goal
+
+                    *   Assemble the different BIM models of the whole project team
+                    *   Coordinate the identified issues
+
+                    # Description
+
+                    *   The different BIM models will be assembled and checked
+                    *   The identified model specific issues will be communicated via BCF files
+                    *   ...
+                item_1:
+                  subject: Issue management, first cycle
+                item_2:
+                  subject: Finishing coordination, first cycle
+                  description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_6:
+              subject: Modelling & coordinating, second cycle
+              description: "## Goal\r\n\r\n*   ...\r\n\r\n## Description\r\n\r\n* \\  ..."
+            item_7:
+              subject: Modelling & coordinating, ... cycle
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_8:
+              subject: Modelling & coordinating, (n-th minus 1) cycle
+              description: "## Goal\r\n\r\n*   ...\r\n\r\n## Description\r\n\r\n* \\  ..."
+            item_9:
+              subject: Modelling & coordinating n-th cycle
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_10:
+              subject: Finishing modelling & coordinating, n-th cycle
+              description: This type is hierarchically a parent of the types &quot;Clash&quot; and &quot;Request&quot;, thus represents a general note.
+            item_11:
+              subject: Use model for construction phase
+              children:
+                item_0:
+                  subject: Handover model for construction crew
+                  description: |-
+                    ## Goal
+
+                    *   Everyone knows the model and their tasks
+                    *   Everybody gets all the relevant information, model based
+                    *   ...
+
+                    ## Description
+
+                    *   The Kickoff on the construction site includes an introduction to the model
+                    *   All the objects should have the information needed for the assigned tasks. If not, data enrichment of the model needs to be done
+                    *   ...
+                item_1:
+                  subject: Construct the building
+                  description: |-
+                    ## Goal
+
+                    *   New issues realized on construction site will be handled model based
+                    *   Issues will be documented by using the BCF files and the BIM model
+
+                    ## Description
+
+                    *   New issues will be documented using BCF files as sticky notes for the model
+                    *   The BCF files will be used to assign, track and correct issues
+                    *   ...
+                item_2:
+                  subject: Finish construction
+            item_12:
+              subject: Issue management, construction phase
+            item_13:
+              subject: Handover for Facility Management
+              description: |-
+                ## Goal
+
+                *   The BIM model will be used for the Facility Management
+                *   The model provides all the relevant information for commissioning and operating the building
+                *   ...
+
+                ## Description
+
+                *   The model contains the relevant information for the facility manager
+                *   The model can be used for the operating system of the building
+                *   ...
+            item_14:
+              subject: Asset Management
+              description: Enjoy your building :)
+        demo-bcf-management-project:
+          name: "(Demo) BCF management"
+          status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
+          description: This is a short summary of the goals of this demo BCF management project.
+          ifc_models:
+            item_0:
+              name: Hospital - Architecture (cc-by-sa-3.0 Autodesk Inc.)
+            item_1:
+              name: Hospital - Structural (cc-by-sa-3.0 Autodesk Inc.)
+            item_2:
+              name: Hospital - Mechanical (cc-by-sa-3.0 Autodesk Inc.)
+          categories:
+            item_0: Category 1 (to be changed in Project settings)
+          queries:
+            item_0:
+              name: Issues
+            item_1:
+              name: Clashes
+            item_2:
+              name: Requests
+            item_3:
+              name: Remarks
+            item_4:
+              name: Project plan
+            item_5:
+              name: Milestones
+            item_6:
+              name: Tasks
+            item_7:
+              name: Team planner
+          boards:
+            bcf:
+              name: BCF issues
+          project-overview:
+            widgets:
+              item_0:
+                options:
+                  name: Welcome
+              item_1:
+                options:
+                  name: Getting started
+                  text: |
+                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+
+                    This demo project shows BCF management functionalities.
+
+                    _Try the following steps:_
+
+                    1.  _Invite new members to your project:_ → Go to [Members]({{opSetting:base_url}}/projects/demo-bcf-management-project/members?show_add_members=true) in the project navigation.
+                    2.  _Upload and view 3D-models in IFC format:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) in the project navigation.
+                    3.  _Create and manage BCF issues linked directly in the IFC model:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) → Create.
+                    4.  _View the BCF files in your project:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bcf-management-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22status%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D) in the project navigation.
+                    5.  _Load your BCF files:_ → Go to [BCF → Import.]({{opSetting:base_url}}/projects/demo-bcf-management-project/issues/upload)
+                    6.  _Create and update a Gantt chart:_ → Go to [Gantt chart]({{opSetting:base_url}}/projects/demo-bcf-management-project/work_packages?query_props=%7B%22c%22%3A%5B%22id%22%2C%22subject%22%2C%22startDate%22%2C%22dueDate%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22days%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22status%22%2C%22o%22%3A%22o%22%2C%22v%22%3A%5B%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%7D) in the project navigation.
+                    7.  _Activate further modules:_ → Go to [Project settings → Modules.]({{opSetting:base_url}}/projects/demo-bcf-management-project/settings/modules)
+                    8.  _You love the agile approach? Create a board:_ → Go to [Boards]({{opSetting:base_url}}/projects/demo-bcf-management-project/boards).
+
+                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
+                    Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
+              item_4:
+                options:
+                  name: Members
+              item_5:
+                options:
+                  name: Work packages
diff --git a/modules/bim/config/locales/crowdin/hy.yml b/modules/bim/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..e6731684abf
--- /dev/null
+++ b/modules/bim/config/locales/crowdin/hy.yml
@@ -0,0 +1,145 @@
+#English strings go here for Rails i18n
+---
+hy:
+  plugin_openproject_bim:
+    name: OpenProject BIM and BCF functionality
+    description: This OpenProject plugin introduces BIM and BCF functionality.
+  bim:
+    label_bim: BIM
+    error_direct_upload_failed: Direct upload failed.
+  bcf:
+    label_bcf: BCF
+    label_imported_failed: Failed imports of BCF topics
+    label_imported_successfully: Successfully imported BCF topics
+    label_bcf_issue_associated: BCF issue associated
+    issues: Issues
+    recommended: recommended
+    not_recommended: not recommended
+    no_viewpoints: No viewpoints
+    new_badge: New
+    exceptions:
+      file_invalid: BCF file invalid
+    x_bcf_issues:
+      zero: No BCF issues
+      one: One BCF issue
+      other: "%{count} BCF issues"
+    bcf_xml:
+      xml_file: BCF XML File
+      import_title: Import
+      export: Export
+      import_update_comment: "(Updated in BCF import)"
+      import_failed: 'Cannot import BCF file: %{error}'
+      import_failed_unsupported_bcf_version: 'Failed to read the BCF file: The BCF version is not supported. Please ensure the version is at least %{minimal_version} or higher.'
+      import_successful: Imported %{count} BCF issues
+      import_canceled: BCF-XML import canceled.
+      type_not_active: The issue type is not activated for this project.
+      import:
+        num_issues_found: "%{x_bcf_issues} are contained in the BCF-XML file, their details are listed below."
+        button_prepare: Prepare import
+        button_perform_import: Confirm import
+        button_proceed: Proceed with import
+        button_back_to_list: Back to list
+        no_permission_to_add_members: You do not have sufficient permissions to add them as members to the project.
+        contact_project_admin: Contact your project admin to add them as members and start this import again.
+        continue_anyways: Do you want to proceed and finish the import anyways?
+        description: Provide a BCF-XML v2.1 file to import into this project. You can examine its contents before performing the import.
+        invalid_types_found: Invalid topic type names found
+        invalid_statuses_found: Invalid status names found
+        invalid_priorities_found: Invalid priority names found
+        invalid_emails_found: Invalid email addresses found
+        unknown_emails_found: Unknown email addresses found
+        unknown_property: Unknown property
+        non_members_found: Non project members found
+        import_types_as: Set all these types to
+        import_statuses_as: Set all these statuses to
+        import_priorities_as: Set all these priorities to
+        invite_as_members_with_role: Invite them as members to the project "%{project}" with role
+        add_as_members_with_role: Add them as members to the project "%{project}" with role
+        no_type_provided: No type provided
+        no_status_provided: No status provided
+        no_priority_provided: No priority provided
+        perform_description: Do you want to import or update the issues listed above?
+        replace_with_system_user: Replace them with "System" user
+        import_as_system_user: Import them as "System" user.
+        what_to_do: What do you want to do?
+        work_package_has_newer_changes: Outdated! This topic was not updated as the latest changes on the server were newer than the "ModifiedDate" of the imported topic. However, comments to the topic were imported.
+        bcf_file_not_found: Failed to locate BCF file. Please start the upload process again.
+  export:
+    format:
+      bcf: BCF-XML
+  attributes:
+    bcf_thumbnail: BCF snapshot
+  project_module_bcf: BCF
+  project_module_bim: BCF
+  permission_view_linked_issues: View BCF issues
+  permission_manage_bcf: Import and manage BCF issues
+  permission_delete_bcf: Delete BCF issues
+  oauth:
+    scopes:
+      bcf_v2_1: Full access to the BCF v2.1 API
+      bcf_v2_1_text: Application will receive full read & write access to the OpenProject BCF API v2.1 to perform actions on your behalf.
+  activerecord:
+    models:
+      bim/ifc_models/ifc_model: IFC model
+    attributes:
+      bim/ifc_models/ifc_model:
+        ifc_attachment: IFC file
+        is_default: Default model
+        attachments: IFC file
+      bim/bcf/issue:
+        bcf_comment: BCF comment
+        bim_snippet: BIM snippet
+        reference_links: Reference links
+        stage: Stage
+        viewpoint: Viewpoint
+    errors:
+      models:
+        bim/ifc_models/ifc_model:
+          attributes:
+            base:
+              ifc_attachment_missing: No ifc file attached.
+              invalid_ifc_file: The provided file is not a valid IFC file.
+        bim/bcf/viewpoint:
+          bitmaps_not_writable: bitmaps is not writable as it is not yet implemented.
+          index_not_integer: index is not an integer.
+          invalid_clipping_planes: clipping_planes is invalid.
+          invalid_components: components is invalid.
+          invalid_lines: lines is invalid.
+          invalid_orthogonal_camera: orthogonal_camera is invalid.
+          invalid_perspective_camera: perspective_camera is invalid.
+          mismatching_guid: The guid in the json_viewpoint does not match the model's guid.
+          no_json: Is not a well structured json.
+          snapshot_type_unsupported: snapshot_type needs to be either 'png' or 'jpg'.
+          snapshot_data_blank: snapshot_data needs to be provided.
+          unsupported_key: An unsupported json property is included.
+        bim/bcf/issue:
+          uuid_already_taken: Can't import this BCF issue as there already is another with the same GUID. Could it be that this BCF issue had already been imported into a different project?
+  ifc_models:
+    label_ifc_models: IFC models
+    label_new_ifc_model: New IFC model
+    label_show_defaults: Show defaults
+    label_default_ifc_models: Default IFC models
+    label_edit_defaults: Edit defaults
+    no_defaults_warning:
+      title: No IFC model was set as default for this project.
+      check_1: Check that you have uploaded at least one IFC model.
+      check_2: Check that at least one IFC model is set to "Default".
+    no_results: No IFC models have been uploaded in this project.
+    conversion_status:
+      label: Processing?
+      pending: Pending
+      processing: Processing
+      completed: Completed
+      error: Error
+    processing_notice:
+      processing_default: 'The following default IFC models are still being processed and are thus not available, yet:'
+    flash_messages:
+      upload_successful: Upload succeeded. It will now get processed and will be ready to use in a couple of minutes.
+    conversion:
+      missing_commands: 'The following IFC converter commands are missing on this system: %{names}'
+  project_module_ifc_models: IFC models
+  permission_view_ifc_models: View IFC models
+  permission_manage_ifc_models: Import and manage IFC models
+  extraction:
+    available:
+      ifc_convert: IFC conversion pipeline available
diff --git a/modules/bim/config/locales/crowdin/js-hy.yml b/modules/bim/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..8f849a393ed
--- /dev/null
+++ b/modules/bim/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,30 @@
+#English strings go here
+---
+hy:
+  js:
+    bcf:
+      label_bcf: BCF
+      import: Import
+      import_bcf_xml_file: Import BCF XML file (BCF version 2.1)
+      export: Export
+      export_bcf_xml_file: Export BCF XML file (BCF version 2.1)
+      viewpoint: Viewpoint
+      add_viewpoint: Add viewpoint
+      show_viewpoint: Show viewpoint
+      delete_viewpoint: Delete viewpoint
+      management: BCF management
+      refresh: Refresh
+      refresh_work_package: Refresh work package
+    ifc_models:
+      empty_warning: This project does not yet have any IFC models.
+      use_this_link_to_manage: Use this link to upload and manage your IFC models
+      keyboard_input_disabled: Viewer does not have keyboard controls. Click on the viewer to give keyboard control to the viewer.
+      models:
+        ifc_models: IFC models
+      views:
+        viewer: Viewer
+        split: Viewer and table
+        split_cards: Viewer and cards
+    revit:
+      revit_add_in: Revit Add-In
+      revit_add_in_settings: Revit Add-In settings
diff --git a/modules/bim/lib/open_project/bim/engine.rb b/modules/bim/lib/open_project/bim/engine.rb
index e26c23c8a17..d33ae69a3f5 100644
--- a/modules/bim/lib/open_project/bim/engine.rb
+++ b/modules/bim/lib/open_project/bim/engine.rb
@@ -238,7 +238,7 @@ module OpenProject::Bim
 
       OpenProject::Authentication.update_strategies(OpenProject::Authentication::Scope::BCF_V2_1,
                                                     store: false) do |_strategies|
-        %i[oauth session]
+        %i[oauth session anonymous_fallback]
       end
     end
     config.to_prepare do
diff --git a/modules/bim/spec/requests/ifc_models/set_direct_upload_filename_spec.rb b/modules/bim/spec/requests/ifc_models/set_direct_upload_filename_spec.rb
index e35b877aa15..c99b4e4432b 100644
--- a/modules/bim/spec/requests/ifc_models/set_direct_upload_filename_spec.rb
+++ b/modules/bim/spec/requests/ifc_models/set_direct_upload_filename_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe "POST /projects/:project_id/ifc_models/set_direct_upload_file_nam
   context "when user is not logged in" do
     it "requires login" do
       post set_direct_upload_file_name_bcf_project_ifc_models_path(project_id: project.id)
-      expect(last_response).to have_http_status(:not_acceptable)
+      expect(last_response).to have_http_status(:found)
     end
   end
 
diff --git a/modules/boards/config/locales/crowdin/hy.seeders.yml b/modules/boards/config/locales/crowdin/hy.seeders.yml
new file mode 100644
index 00000000000..e593f1466bc
--- /dev/null
+++ b/modules/boards/config/locales/crowdin/hy.seeders.yml
@@ -0,0 +1,9 @@
+#This file has been generated by script/i18n/generate_seeders_i18n_source_file.
+#Please do not edit directly.
+#This file is part of the sources sent to crowdin for translation.
+#This file is needed to prevent bug #48450: at least two 'en.seeders.yml' files
+#located in the modules directories are needed to have crowdin cli correctly
+#compute the path to the uploaded source file.
+#This file does not contain any i18n strings.
+---
+hy:
diff --git a/modules/boards/config/locales/crowdin/hy.yml b/modules/boards/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..9c94c82ed19
--- /dev/null
+++ b/modules/boards/config/locales/crowdin/hy.yml
@@ -0,0 +1,47 @@
+#English strings go here
+---
+hy:
+  plugin_openproject_boards:
+    name: OpenProject Boards
+    description: Provides board views.
+  permission_show_board_views: View boards
+  permission_manage_board_views: Manage boards
+  project_module_board_view: Boards
+  ee:
+    upsell:
+      board_view:
+        description: Would you like to automate your workflows with Boards? Advanced boards are an Enterprise add-on. Please upgrade to a paid plan.
+  boards:
+    label_board: Board
+    label_boards: Boards
+    label_create_new_board: Create new board
+    label_board_type: Board type
+    board_types:
+      free: Basic
+      action: Action board (%{attribute})
+    board_type_attributes:
+      assignee: Assignee
+      status: Kanban
+      version: Version
+      subproject: Subproject
+      subtasks: Parent-child
+      basic: Basic
+    board_type_descriptions:
+      basic: 'Start from scratch with a blank board. Manually add cards and columns to this board.
+
+        '
+      status: 'Basic kanban style board with columns for status such as To Do, In Progress, Done.
+
+        '
+      assignee: 'Board with automated columns based on assigned users. Ideal for dispatching work packages.
+
+        '
+      version: 'Board with automated columns based on the version attribute. Ideal for planning product development.
+
+        '
+      subproject: 'Board with automated columns for subprojects. Dragging work packages to other lists updates the (sub-)project accordingly.
+
+        '
+      subtasks: 'Board with automated columns for sub-elements. Dragging work packages to other lists updates the parent accordingly.
+
+        '
diff --git a/modules/boards/config/locales/crowdin/js-hy.yml b/modules/boards/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..2dc288c0a40
--- /dev/null
+++ b/modules/boards/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,95 @@
+#English strings go here
+---
+hy:
+  ee:
+    upsell:
+      board_view:
+        description: Would you like to automate your workflows with Boards? Advanced boards are an Enterprise add-on. Please upgrade to a paid plan.
+  js:
+    boards:
+      create_new: Create new board
+      label_unnamed_board: Unnamed board
+      label_unnamed_list: Unnamed list
+      label_board_type: Board type
+      lists:
+        delete: Delete list
+      version:
+        is_locked: Version is locked. No items can be added to this version.
+        is_closed: Version is closed. No items can be added to this version.
+        close_version: Close version
+        open_version: Open version
+        lock_version: Lock version
+        unlock_version: Unlock version
+        edit_version: Edit version
+        show_version: Show version
+        locked: Locked
+        closed: Closed
+      new_board: New board
+      add_list: Add list to board
+      add_card: Add card
+      error_attribute_not_writable: Cannot move the work package, %{attribute} is not writable.
+      error_loading_the_list: 'Error loading the list: %{error_message}'
+      error_permission_missing: The permission to create public queries is missing
+      error_cannot_move_into_self: You can not move a work package into its own column.
+      text_hidden_list_warning: Not all lists are displayed because you lack the permission. Contact your admin for more information.
+      click_to_remove_list: Click to remove this list
+      board_type:
+        text: Board type
+        free: basic
+        select_board_type: Please choose the type of board you need.
+        free_text: 'Start from scratch with a blank board. Manually add cards and columns to this board.
+
+          '
+        action: Action board
+        action_by_attribute: Action board (%{attribute})
+        action_text: 'A board with filtered lists on %{attribute} attribute. Moving work packages to other lists will update their attribute.
+
+          '
+        action_text_subprojects: 'Board with automated columns for subprojects. Dragging work packages to other lists updates the (sub-)project accordingly.
+
+          '
+        action_text_subtasks: 'Board with automated columns for sub-elements. Dragging work packages to other lists updates the parent accordingly.
+
+          '
+        action_text_status: 'Basic kanban style board with columns for status such as To Do, In Progress, Done.
+
+          '
+        action_text_assignee: 'Board with automated columns based on assigned users. Ideal for dispatching work packages.
+
+          '
+        action_text_version: 'Board with automated columns based on the version attribute. Ideal for planning product development.
+
+          '
+        action_type:
+          assignee: assignee
+          status: status
+          version: version
+          subproject: subproject
+          subtasks: parent-child
+        board_type_title:
+          assignee: Assignee
+          status: Status
+          version: Version
+          subproject: Subproject
+          subtasks: Parent-child
+          basic: Basic
+        select_attribute: Action attribute
+      add_list_modal:
+        labels:
+          assignee: Select user to add as a new assignee list
+          status: Select status to add as a new list
+          version: Select version to add as a new list
+          subproject: Select subproject to add as a new list
+          subtasks: Select work package to add as a new list
+        warning:
+          status: |
+            There is currently no status available. <br>
+            Either there are none or they have all already been added to the board.
+          assignee: There isn't any member matched with your filter value.  <br>
+          no_member: This project currently does not have any members that can be added.  <br>
+          add_members: <a href="%{link}">Add a new member to this project</a> to select users again.
+      configuration_modal:
+        title: Configure this board
+        display_settings:
+          card_mode: Display as cards
+          table_mode: Display as table
diff --git a/modules/budgets/config/locales/crowdin/hy.yml b/modules/budgets/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..bfff3b221c8
--- /dev/null
+++ b/modules/budgets/config/locales/crowdin/hy.yml
@@ -0,0 +1,128 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  plugin_budgets_engine:
+    name: Budgets
+  activerecord:
+    attributes:
+      budget:
+        author: Author
+        available: Available
+        budget: Planned
+        budget_ratio: Spent (ratio)
+        description: Description
+        spent: Spent
+        status: Status
+        subject: Subject
+        type: Cost type
+        labor_budget: Planned labor costs
+        labor_budget_items: Planned labor costs
+        material_budget: Planned unit costs
+        base_amount: Base amount
+      work_package:
+        budget_subject: Budget title
+    errors:
+      models:
+        labor_budget_item:
+          attributes:
+            principal:
+              not_a_member_of_budget_project: is not a member of the budget's project
+    models:
+      budget: Budget
+      labor_budget_item: Planned labor cost
+      material_budget_item: Unit
+  activity:
+    filter:
+      budget: Budgets
+  attributes:
+    budget: Budget
+  button_add_budget_item: Add planned costs
+  button_add_budget: Add budget
+  button_add_cost_type: Add cost type
+  button_cancel_edit_budget: Cancel editing budget
+  button_cancel_edit_costs: Cancel editing costs
+  caption_labor: Labor
+  caption_labor_costs: Actual labor costs
+  caption_material_costs: Actual unit costs
+  budgets_title: Budgets
+  budgets:
+    widgets:
+      budget_totals:
+        title: Budget totals
+        remaining_budget: Remaining budget
+        spent_budget: Spent budget
+        total_actual_costs: Total actual costs
+        total_planned_budget: Total planned budget
+      budget_by_cost_type:
+        title: Budget by cost type
+        blankslate:
+          heading: Start project controlling
+          description: Get an overview of your budgets and costs to efficiently track the health status of your project
+        blankslate_zero:
+          heading: Budget details missing
+          description: Add details about your planned budget to see data here
+        count_caption:
+          zero: No budget data.
+          one: Data aggregated from %{count} budget
+          other: Data aggregated from %{count} budgets
+        count_caption_with_subitems:
+          project:
+            zero: No budget data.
+            one: Data aggregated from %{count} budget included in this project and its subitems.
+            other: Data aggregated from %{count} budgets included in this project and its subitems.
+          program:
+            zero: No budget data.
+            one: Data aggregated from %{count} budget included in this program and its subitems.
+            other: Data aggregated from %{count} budgets included in this program and its subitems.
+          portfolio:
+            zero: No budget data.
+            one: Data aggregated from %{count} budget included in this portfolio and its subitems.
+            other: Data aggregated from %{count} budgets included in this portfolio and its subitems.
+        view_details: View budget details
+  events:
+    budget: Budget edited
+  help_click_to_edit: Click here to edit.
+  help_currency_format: Format of displayed currency values. %n is replaced with the currency value, %u ist replaced with the currency unit.
+  help_override_rate: Enter a value here to override the default rate.
+  label_budget: Budget
+  label_budget_available: Budget available
+  label_budget_id: 'Budget #%{id}'
+  label_budget_new: New budget
+  label_budget_planned: Budget planned
+  label_budget_plural: Budgets
+  label_budget_spent: Budget spent
+  label_budget_spent_ratio: Budget spent ratio
+  label_deliverable: Budget
+  label_example_placeholder: e.g., %{decimal}
+  label_view_all_budgets: View all budgets
+  label_yes: 'Yes'
+  label_budget_totals: Totals
+  label_budget_details: Budget details
+  notice_budget_conflict: Work packages must be of the same project.
+  notice_no_budgets_available: No budgets available.
+  permission_edit_budgets: Edit budgets
+  permission_view_budgets: View budgets
+  project_module_budgets: Budgets
+  text_budget_reassign_to: 'Reassign them to this budget:'
+  text_budget_delete: Delete the budget from all work packages
+  text_budget_destroy_assigned_wp: There are %{count} work packages assigned to this budget. What do you want to do?
diff --git a/modules/budgets/config/locales/crowdin/js-hy.yml b/modules/budgets/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..44ab3ab0381
--- /dev/null
+++ b/modules/budgets/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,27 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    work_packages:
+      properties:
+        costObject: Budget
diff --git a/modules/budgets/frontend/module/main.ts b/modules/budgets/frontend/module/main.ts
index 34c44dbc399..09feb4e0e29 100644
--- a/modules/budgets/frontend/module/main.ts
+++ b/modules/budgets/frontend/module/main.ts
@@ -24,7 +24,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { OpenProjectPluginContext } from 'core-app/features/plugins/plugin-context';
 import { multiInput } from '@openproject/reactivestates';
 import { PlannedCostsFormAugment } from 'core-app/features/plugins/linked/budgets/augment/planned-costs-form';
@@ -49,7 +49,9 @@ export function initializeCostsPlugin(injector:Injector) {
 
 @NgModule({})
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeCostsPlugin(injector);
   }
 }
diff --git a/modules/budgets/spec/support/pages/budget_form.rb b/modules/budgets/spec/support/pages/budget_form.rb
index ca16e957221..e0a92f75a75 100644
--- a/modules/budgets/spec/support/pages/budget_form.rb
+++ b/modules/budgets/spec/support/pages/budget_form.rb
@@ -59,12 +59,13 @@ module Pages
       prefix = "#{unit_cost_attr_id(type)}_#{id}"
       options = { fill_options: { clear: :backspace } }
 
-      fill_in("#{prefix}_units", with: units, **options) if units.present?
-      fill_in("#{prefix}_comments", with: comment, **options) if comment.present?
+      retry_block do
+        fill_in("#{prefix}_units", with: units, **options) if units.present?
+        fill_in("#{prefix}_comments", with: comment, **options) if comment.present?
 
-      if expected_costs.present?
-        wait_for_network_idle
-        expect(page).to have_css("##{prefix}_costs", text: expected_costs)
+        if expected_costs.present?
+          expect(page).to have_css("##{prefix}_costs", text: expected_costs)
+        end
       end
     end
 
@@ -102,13 +103,14 @@ module Pages
       prefix = "#{labor_cost_attr_id(type)}_#{id}"
       options = { fill_options: { clear: :backspace } }
 
-      fill_in("#{prefix}_hours", with: hours, **options) if hours.present?
-      select user_name, from: "#{prefix}_user_id" if user_name.present?
-      fill_in("#{prefix}_comments", with: comment, **options) if comment.present?
+      retry_block do
+        fill_in("#{prefix}_hours", with: hours, **options) if hours.present?
+        select user_name, from: "#{prefix}_user_id" if user_name.present?
+        fill_in("#{prefix}_comments", with: comment, **options) if comment.present?
 
-      if expected_costs.present?
-        wait_for_network_idle
-        expect(page).to have_css("##{prefix}_costs", text: expected_costs)
+        if expected_costs.present?
+          expect(page).to have_css("##{prefix}_costs", text: expected_costs)
+        end
       end
     end
 
diff --git a/modules/calendar/config/locales/crowdin/hy.yml b/modules/calendar/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..0819e4fcb1c
--- /dev/null
+++ b/modules/calendar/config/locales/crowdin/hy.yml
@@ -0,0 +1,13 @@
+#English strings go here
+---
+hy:
+  plugin_openproject_calendar:
+    name: OpenProject Calendar
+    description: Provides calendar views.
+  label_calendar: Calendar
+  label_calendar_plural: Calendars
+  label_new_calendar: New calendar
+  permission_view_calendar: View calendars
+  permission_manage_calendars: Manage calendars
+  permission_share_calendars: Subscribe to iCalendars
+  project_module_calendar_view: Calendars
diff --git a/modules/calendar/config/locales/crowdin/js-hy.yml b/modules/calendar/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..dbda03f5120
--- /dev/null
+++ b/modules/calendar/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,10 @@
+#English strings go here
+---
+hy:
+  js:
+    calendar:
+      create_new: Create new calendar
+      title: Calendar
+      too_many: There are %{count} work packages in total, but only %{max} can be shown.
+      unsaved_title: Unnamed calendar
+      label_calendar_plural: Calendars
diff --git a/modules/costs/config/locales/crowdin/hy.yml b/modules/costs/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..a2abfc42edb
--- /dev/null
+++ b/modules/costs/config/locales/crowdin/hy.yml
@@ -0,0 +1,246 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  plugin_costs:
+    name: Time and costs
+    description: This module adds features for planning and tracking costs of projects.
+  activerecord:
+    attributes:
+      cost_entry:
+        work_package: Work package
+        overridden_costs: Overridden costs
+        spent: Spent
+        spent_on: Date
+        logged_by: Logged by
+        entity: Logged for
+        entity_id: Logged for
+        entity_gid: Logged for
+      cost_type:
+        unit: Unit name
+        unit_plural: Pluralized unit name
+        default: Cost type by default
+      work_package:
+        costs_by_type: Spent units
+        labor_costs: Labor costs
+        material_costs: Unit costs
+        overall_costs: Overall costs
+        spent_costs: Spent costs
+        spent_units: Spent units
+      rate:
+        rate: Rate
+      user:
+        default_rates: Default rates
+      time_entry:
+        project: Project
+        user: User
+        work_package: Work package
+        subject: Subject
+        hours: Hours
+        comments: Comment
+        activity: Activity
+        spent_on: Date
+        start_time: Start time
+        end_time: Finish time
+        time: Time
+        entity: Logged for
+        entity_id: Logged for
+        entity_gid: Logged for
+    models:
+      time_entry:
+        one: Time entry
+        other: Time entries
+      cost_entry:
+        one: Cost entry
+        other: Cost entries
+      cost_type:
+        one: Cost type
+        other: Cost types
+      time_entry_activity:
+        one: Time tracking activity
+        other: Time tracking activities
+      rate: Rate
+    errors:
+      models:
+        time_entry:
+          invalid_time: must be between 00:00 and 23:59.
+          cannot_log_for_this_work_package: Cannot log time for this work package.
+          duplicate_ongoing: An ongoing time entry already exists for this user.
+        work_package:
+          is_not_a_valid_target_for_cost_entries: 'Work package #%{id} is not a valid target for reassigning the cost entries.'
+          nullify_is_not_valid_for_cost_entries: Cost entries can not be assigned to a project.
+  attributes:
+    comment: Comment
+    cost_type: Cost type
+    costs: Costs
+    current_rate: Current rate
+    hours: Hours
+    units: Units
+    valid_from: Valid from
+    fixed_date: Fixed date
+  button_add_rate: Add rate
+  button_log_costs: Log unit costs
+  button_log_time: Log
+  button_add_activity: Activity
+  button_add_time_entry: Log time
+  button_stop_timer: Stop timer
+  caption_booked_on_project: Booked on project
+  caption_default: Default
+  caption_default_rate_history_for: Default rate history for %{user}
+  caption_locked_on: Locked on
+  caption_materials: Units
+  caption_rate_history: Rate history
+  caption_rate_history_for: Rate history for %{user}
+  caption_rate_history_for_project: Rate history for %{user} in project %{project}
+  caption_save_rate: Save rate
+  caption_set_rate: Set current rate
+  caption_show_locked: Show locked types
+  caption_log_time_dialog: Log time
+  description_date_for_new_rate: Date for new rate
+  description_costs_settings: Define the desired format for the costs in all projects.
+  description_time_settings: Define which fields are mandatory to fill when logging time in all projects.
+  group_by_others: not in any group
+  label_between: between
+  label_cost_filter_add: Add cost entry filter
+  label_costlog: Logged unit costs
+  label_cost_plural: Costs
+  label_cost_type_plural: Cost types
+  label_cost_type_specific: 'Cost type #%{id}: %{name}'
+  label_costs_per_page: Costs per page
+  label_current_default_rate: Current default rate
+  label_date_on: 'on'
+  label_deleted_cost_types: Deleted cost types
+  label_locked_cost_types: Locked cost types
+  label_display_cost_entries: Display unit costs
+  label_display_time_entries: Display reported hours
+  label_display_types: Display types
+  label_edit: Edit
+  label_generic_user: Generic user
+  label_greater_or_equal: ">="
+  label_group_by: Group by
+  label_group_by_add: Add grouping field
+  label_hourly_rate: Hourly rate
+  label_include_deleted: Include deleted
+  label_work_package_filter_add: Add work package filter
+  label_kind: Type
+  label_less_or_equal: "<="
+  label_log_costs: Log unit costs
+  label_new_time_entry_activity: New time entry activity
+  label_time_entry_activity_form_description: Changes to this time entry activity will be reflected in all projects where it is enabled.
+  label_no: 'No'
+  label_option_plural: Options
+  label_overall_costs: Overall costs
+  label_rate: Rate
+  label_rate_plural: Rates
+  label_status_finished: Finished
+  label_show: Show
+  label_units: Cost units
+  label_user: User
+  label_until: until
+  label_valid_from: Valid from
+  label_yes: 'Yes'
+  label_time: Time
+  label_cost: Cost
+  label_costs: Costs
+  label_mandatory_fields: Mandatory fields
+  label_my_time_tracking: My time tracking
+  label_no_time: No time tracked
+  label_next_day: Next day
+  label_next_week: Next week
+  label_next_workweek: Next work week
+  label_next_month: Next month
+  label_previous_day: Previous day
+  label_previous_workweek: Previous work week
+  label_previous_week: Previous week
+  label_previous_month: Previous month
+  label_specific_day: Day %{day}
+  label_specific_month: Month %{month}
+  label_list: List
+  label_month: Month
+  label_workweek: Work week
+  label_day: Day
+  label_today_capitalized: Today
+  label_view_mode_switcher: Change view
+  label_timer_since: Started at %{time}
+  placeholder_activity_select_work_package_first: Work package selection is required first
+  notice_something_wrong: Something went wrong. Please try again.
+  notice_successful_restore: Successful restore.
+  notice_successful_lock: Locked successfully.
+  notice_cost_logged_successfully: Unit cost logged successfully.
+  notice_different_time_zones: This user has a different time zone (%{tz}). Time will be logged using their time zone.
+  notice_time_entry_update_failed: 'Failed to update time entry. Errors: %{errors}'
+  notice_time_entry_delete_failed: 'Failed to delete time entry. Errors: %{errors}'
+  permission_edit_cost_entries: Edit booked unit costs
+  permission_edit_own_cost_entries: Edit own booked unit costs
+  permission_edit_hourly_rates: Edit hourly rates
+  permission_edit_own_hourly_rate: Edit own hourly rates
+  permission_edit_rates: Edit rates
+  permission_log_costs: Book unit costs
+  permission_log_own_costs: Book unit costs for oneself
+  permission_view_cost_entries: View booked costs
+  permission_view_cost_rates: View cost rates
+  permission_view_hourly_rates: View all hourly rates
+  permission_view_own_cost_entries: View own booked costs
+  permission_view_own_hourly_rate: View own hourly rate
+  permission_view_own_time_entries: View own spent time
+  project_module_costs: Time and costs
+  setting_allow_tracking_start_and_end_times: Allow start and finish times
+  setting_costs_currency: Currency
+  setting_costs_currency_caption: This is the unit of currency. It can be a three-letter ISO code like EUR, USD or JPY or a symbol like €, $ or ¥.
+  setting_costs_currency_format: Currency format
+  setting_costs_currency_format_prefix: Before the number (e.g. EUR 100)
+  setting_costs_currency_format_suffix: After the number (e.g. 100 EUR)
+  setting_enforce_tracking_start_and_end_times: Require start and finish times
+  setting_enforce_without_allow: Requiring start and finish times is not possible without allowing them
+  setting_allow_tracking_start_and_end_times_caption: Enables entering start and finish times when logging time.
+  setting_enforce_tracking_start_and_end_times_caption: Makes entering start and finish times mandatory when logging time.
+  text_assign_time_and_cost_entries_to_project: Assign reported hours and costs to the project
+  text_destroy_cost_entries_question: "%{cost_entries} were reported on the work packages you are about to delete. What do you want to do ?"
+  text_destroy_time_and_cost_entries: Delete reported hours and costs
+  text_destroy_time_and_cost_entries_question: "%{hours} hours, %{cost_entries} were reported on the work packages you are about to delete. What do you want to do ?"
+  text_reassign_time_and_cost_entries: 'Reassign reported hours and costs to this work package:'
+  text_warning_hidden_elements: Some entries may have been excluded from the aggregation.
+  week: week
+  total_times:
+    workweek: 'Workweek Total: %{hours}'
+    week: 'Week Total: %{hours}'
+    month: 'Month Total: %{hours}'
+    day: 'Day Total: %{hours}'
+  api_v3:
+    errors:
+      validation:
+        start_time_different_date: Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date.
+  costs:
+    widgets:
+      actual_costs:
+        title: Actual costs by month
+        blankslate:
+          heading: Start tracking your time and costs
+          description: Get an overview of your costs and logged time to monitor progress of your project. Make sure that work packages are associated with the correct budget.
+          action: Log time
+        view_details: View actual costs details
+  ee:
+    features:
+      time_entry_time_restrictions: Require exact time tracking
+    upsell:
+      time_entry_time_restrictions:
+        description: Improve your time tracking by requiring exact start and finish times when logging time.
diff --git a/modules/costs/config/locales/crowdin/js-hy.yml b/modules/costs/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..82efc27cccc
--- /dev/null
+++ b/modules/costs/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,36 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    text_are_you_sure: Are you sure?
+    myTimeTracking:
+      noSpecificTime: No specific time
+    work_packages:
+      property_groups:
+        costs: Costs
+      properties:
+        overallCosts: Overall costs
+        spentUnits: Spent units
+    button_log_costs: Log unit costs
+    label_hour: hour
+    label_hours: hours
diff --git a/modules/costs/frontend/module/main.ts b/modules/costs/frontend/module/main.ts
index 5756afa08ee..6df0bfba8ad 100644
--- a/modules/costs/frontend/module/main.ts
+++ b/modules/costs/frontend/module/main.ts
@@ -24,7 +24,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { OpenProjectPluginContext } from 'core-app/features/plugins/plugin-context';
 import { CostsByTypeDisplayField } from './wp-display/costs-by-type-display-field.module';
 import { CurrencyDisplayField } from './wp-display/currency-display-field.module';
@@ -64,7 +64,9 @@ export function initializeCostsPlugin(injector:Injector) {
   ],
 })
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeCostsPlugin(injector);
   }
 }
diff --git a/modules/documents/config/locales/crowdin/hy.seeders.yml b/modules/documents/config/locales/crowdin/hy.seeders.yml
new file mode 100644
index 00000000000..8181636f11f
--- /dev/null
+++ b/modules/documents/config/locales/crowdin/hy.seeders.yml
@@ -0,0 +1,20 @@
+# This file has been generated by script/i18n/generate_seeders_i18n_source_file.
+# Please do not edit directly.
+# This file is part of the sources sent to crowdin for translation.
+---
+hy:
+  seeds:
+    common:
+      document_types:
+        item_0:
+          name: Note
+        item_1:
+          name: Idea
+        item_2:
+          name: Proposal
+        item_3:
+          name: Specification
+        item_4:
+          name: Report
+        item_5:
+          name: Documentation
diff --git a/modules/documents/config/locales/crowdin/hy.yml b/modules/documents/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..06fffc6f658
--- /dev/null
+++ b/modules/documents/config/locales/crowdin/hy.yml
@@ -0,0 +1,159 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  plugin_openproject_documents:
+    name: OpenProject Documents
+    description: An OpenProject plugin to allow creation of documents in projects.
+  attributes:
+    collaborative_editing_hocuspocus_url: Hocuspocus server URL
+  activerecord:
+    errors:
+      models:
+        document_type:
+          one_or_more_required: Cannot delete the last document type
+    models:
+      document: Document
+      documents: Documents
+    attributes:
+      document:
+        content_binary: Content binary
+        title: Title
+  activity:
+    filter:
+      document: Documents
+  default_doc_category_tech: Technical documentation
+  default_doc_category_user: User documentation
+  enumeration_doc_categories: Document categories
+  documents:
+    page_header:
+      heading: All documents
+      action_menu:
+        document_actions: Document actions
+        edit_title: Edit title
+    subheader:
+      filter:
+        label: Document name filter
+        placeholder: Type here to search document names
+    documents_list_blank_slate:
+      heading: There are no documents yet
+      description: There are no documents in this view. You can click the button below to add one.
+    document_categories_deprecation_notice:
+      heading: File categories are now called 'Document types'
+      description: |-
+        Your existing file categories have been converted to document types with the introduction of the new Documents module.
+        All existing documents have also been migrated to these new types.
+      primary_action: Configure document types
+      secondary_action: Learn more about the Documents module
+    document_type_actions: Document type actions
+    text_collaboration_disabled_notice:
+      description: |-
+        Unable to open document because real-time text collaboration is disabled.
+        Please contact your administrator to enable real-time text collaboration if you want to access this document.
+    show_edit_view:
+      connection_error_notice:
+        description_server_unavailable: |-
+          Unable to open document because the real-time text collaboration server is unreachable.
+          Please contact the administrator if the problem persists.
+        action: Try again
+      tabs: Document tabs
+    index_page:
+      name: Name
+      type: Type
+      updated_at: Last edited
+      label_legacy: Legacy
+    menu:
+      all: All documents
+      types: Types
+      collaboration_settings: Real-time collaboration
+    last_updated_at: Last saved %{time}.
+    info_line:
+      currently_offline: You are currently offline.
+      connection_restored: You are now back online.
+    active_editors: Active editors
+    active_editors_count:
+      one: 1 active editor
+      other: "%{count} active editors"
+    label_attachment_author: Attachment author
+    label_categories: Categories
+    new_category: New category
+    new_type: New type
+    delete_dialog:
+      title: Delete document
+      heading: Delete this document?
+      confirmation_message_html: This will permanently delete this document and all file attachments. Are you sure you want to do this?
+    delete_document_type_dialog:
+      title: Delete document type
+      heading: Delete this document type?
+      confirmation_message: The type "%{type_name}" is currently unused. Deleting this type will have no effect on existing documents.
+      select_reassign_to_label: Reassign documents to
+      reassign_message:
+        one: The type "%{type_name}" is currently being used in %{document_count} document. Please select which type to reassign them to.
+        other: The type "%{type_name}" is currently being used in %{document_count} documents. Please select which type to reassign them to.
+      at_least_one_type_required:
+        title: Cannot delete document type
+        heading: Cannot delete the last document type
+        message: There must always be at least one document type configured. Create another one first if you want to delete this one.
+    admin:
+      collaboration_settings:
+        page_header:
+          description: |-
+            When enabled, real-time collaboration allows multiple users to edit a document at the same time.
+            It requires a working %{hocuspocus_server_link} to function.
+        banner:
+          none_writable: These values are configured via environment variables and cannot be edited here.
+          some_unwritable: Some values are configured via environment variables and cannot be edited here.
+        hocuspocus_server_url:
+          label: Hocuspocus server URL
+          caption: The WebSocket address of a working Hocuspocus server.
+          invalid_scheme: Must use a WebSocket protocol (ws:// or wss://).
+        hocuspocus_server_secret:
+          label: Client secret
+          caption: Paste the secret provided by the Hocuspocus server.
+        hocuspocus_server: Hocuspocus server
+      enable_text_collaboration:
+        heading: Real-time collaboration is not enabled
+        description: |-
+          Once enabled, multiple users will be able to work together on a document at the same time.
+          All new documents will be based on a new editor (BlockNote) and will require a working connection to a
+          Hocuspocus server.
+        primary_action: Enable real-time collaboration
+        success: Real-time collaboration has been enabled.
+      disable_text_collaboration_dialog:
+        title: Disable real-time collaboration
+        heading: Disable real-time collaboration?
+        confirmation_message: |-
+          All existing documents may become inaccessible. Please only do this if you are certain you want to disable
+          real-time collaboration and the BlockNote editor in this instance.
+        confirmation_checkbox_message: I understand that I might permanently lose data
+        success: Real-time collaboration has been disabled.
+  label_document_added: Document added
+  label_document_new: New document
+  label_document_plural: Documents
+  label_documents: Documents
+  label_document_title: Title
+  label_document_description: Description
+  label_document_category: Category
+  label_document_type: Type
+  permission_manage_documents: Manage documents
+  permission_view_documents: View documents
+  project_module_documents: Documents
diff --git a/modules/gantt/config/locales/crowdin/hy.yml b/modules/gantt/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..5f1807b11a6
--- /dev/null
+++ b/modules/gantt/config/locales/crowdin/hy.yml
@@ -0,0 +1,4 @@
+#English strings go here
+---
+hy:
+  project_module_gantt: Gantt charts
diff --git a/modules/gantt/config/locales/crowdin/js-hy.yml b/modules/gantt/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..7ae79dfed8b
--- /dev/null
+++ b/modules/gantt/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,7 @@
+---
+hy:
+  js:
+    work_packages:
+      label_gantt_chart_plural: Gantt charts
+      default_queries:
+        milestones: Milestones
diff --git a/modules/github_integration/config/locales/crowdin/hy.yml b/modules/github_integration/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..b61dad9deae
--- /dev/null
+++ b/modules/github_integration/config/locales/crowdin/hy.yml
@@ -0,0 +1,69 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  attributes:
+    additions_count: Number of additions
+    deletions_count: Number of deletions
+    comments_count: Comments count
+    github_html_url: Pull Request URL
+    github_app_owner_avatar_url: Owner avatar URL
+    review_comments_count: Review comments count
+    github: GitHub identifer
+    github_avatar_url: Avatar URL
+    github_updated_at: Updated at
+    github_login: GitHub login
+    host: Host
+    labels: Labels
+    repository: Repository
+    changed_files_count: Changed files
+  button_add_deploy_target: Add deploy target
+  label_deploy_target: Deploy target
+  label_deploy_target_new: New deploy target
+  label_deploy_target_plural: Deploy targets
+  label_github_integration: GitHub Integration
+  notice_deploy_target_created: Deploy target created
+  notice_deploy_target_destroyed: Deploy target deleted
+  label_github_comment_user: GitHub actor
+  label_github_webhook_secret: Webhook secret
+  text_github_comment_user_info: 'The OpenProject user whose API key must be used to authenticate incoming webhook requests. When set, requests authenticated with any other user''s credentials are rejected. This user also posts automated deploy-status comments on work packages. Defaults to the system user when not set.
+
+    '
+  text_github_webhook_secret_missing_warning: 'No webhook secret is configured. Any request to the GitHub webhook endpoint will be accepted without verification, which may allow unauthorized actors to forge events. It is strongly recommended to set a secret.
+
+    '
+  text_github_webhook_secret_info: 'A secret token shared with GitHub when configuring the webhook. When set, OpenProject verifies the X-Hub-Signature-256 header on every incoming request, rejecting payloads that do not match. Leave blank to skip verification (not recommended).
+
+    '
+  plugin_openproject_github_integration:
+    name: OpenProject GitHub Integration
+    description: Integrates OpenProject and GitHub for a better workflow
+  project_module_github: GitHub
+  permission_show_github_content: Show GitHub content
+  permission_introspection: Read running OpenProject core version and build SHA
+  text_deploy_target_type_info: 'So far we only support OpenProject itself.
+
+    '
+  text_deploy_target_api_key_info: 'An OpenProject [API key](docs_url) belonging to a user who has the global introspection permission.
+
+    '
+  text_pull_request_deployed_to: "%{pr_link} deployed to %{deploy_target_link}"
diff --git a/modules/github_integration/config/locales/crowdin/js-hy.yml b/modules/github_integration/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..97f2a79cd2e
--- /dev/null
+++ b/modules/github_integration/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,55 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    github_integration:
+      work_packages:
+        tab_name: GitHub
+      tab_header:
+        title: Pull requests
+        copy_menu:
+          label: Git snippets
+          description: Copy git snippets to clipboard
+        git_actions:
+          branch_name: Branch name
+          commit_message: Commit message
+          cmd: Create branch with empty commit
+          title: Quick snippets for Git
+          copy_success: "✅ Copied!"
+          copy_error: "❌ Copy failed!"
+      tab_prs:
+        empty: There are no pull requests linked yet. Link an existing PR by using the code <code>OP#%{wp_id}</code> in the PR description or create a new PR.
+      github_actions: Actions
+      pull_requests:
+        message: 'Pull request #%{pr_number} %{pr_link} for %{repository_link} authored by %{github_user_link} has been %{pr_state}.'
+        merged_message: 'Pull request #%{pr_number} %{pr_link} for %{repository_link} has been %{pr_state} by %{github_user_link}.'
+        referenced_message: 'Pull request #%{pr_number} %{pr_link} for %{repository_link} authored by %{github_user_link} referenced this work package.'
+        states:
+          opened: opened
+          closed: closed
+          draft: drafted
+          merged: merged
+          ready_for_review: marked ready for review
+    work_packages:
+      tabs:
+        github: GitHub
diff --git a/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts b/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts
index e63848fd4f5..aaa7b9275a8 100644
--- a/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts
+++ b/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts
@@ -27,18 +27,10 @@
 //++
 
 import copy from 'copy-text-to-clipboard';
-import {
-  Component,
-  Inject,
-  Input,
-} from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { GitActionsService } from '../git-actions/git-actions.service';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { OPContextMenuComponent } from "core-app/shared/components/op-context-menu/op-context-menu.component";
-import {
-  OpContextMenuLocalsMap,
-  OpContextMenuLocalsToken,
-} from "core-app/shared/components/op-context-menu/op-context-menu.types";
 import { I18nService } from "core-app/core/i18n/i18n.service";
 import { ISnippet } from 'core-app/features/plugins/linked/openproject-github_integration/state/github-pull-request.model';
 
@@ -52,6 +44,9 @@ import { ISnippet } from 'core-app/features/plugins/linked/openproject-github_in
   standalone: false,
 })
 export class GitActionsMenuComponent extends OPContextMenuComponent {
+  readonly I18n = inject(I18nService);
+  readonly gitActions = inject(GitActionsService);
+
   @Input() public workPackage:WorkPackageResource;
 
   public text = {
@@ -90,13 +85,8 @@ export class GitActionsMenuComponent extends OPContextMenuComponent {
     },
   ];
 
-  constructor(
-    @Inject(OpContextMenuLocalsToken)
-    public locals:OpContextMenuLocalsMap,
-    readonly I18n:I18nService,
-    readonly gitActions:GitActionsService,
-  ) {
-    super(locals);
+  constructor() {
+    super();
     this.workPackage = this.locals.workPackage as WorkPackageResource;
   }
 
diff --git a/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts b/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts
index 5e446816f14..369ac12b767 100644
--- a/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts
+++ b/modules/github_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts
@@ -27,8 +27,7 @@
 //++
 
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef, Input } from '@angular/core';
+import { Directive, Input } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { GitActionsMenuComponent } from './git-actions-menu.component';
@@ -40,11 +39,6 @@ import { GitActionsMenuComponent } from './git-actions-menu.component';
 export class GitActionsMenuDirective extends OpContextMenuTrigger {
   @Input('gitActionsCopyDropdown-workPackage') public workPackage:WorkPackageResource;
 
-  constructor(readonly elementRef:ElementRef,
-              readonly opContextMenu:OPContextMenuService) {
-    super(elementRef, opContextMenu);
-  }
-
   protected open(evt:Event) {
     this.opContextMenu.show(this, evt, GitActionsMenuComponent);
   }
diff --git a/modules/github_integration/frontend/module/github-tab/github-tab.component.ts b/modules/github_integration/frontend/module/github-tab/github-tab.component.ts
index 30451171070..d8ec7b690a9 100644
--- a/modules/github_integration/frontend/module/github-tab/github-tab.component.ts
+++ b/modules/github_integration/frontend/module/github-tab/github-tab.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { TabComponent } from "core-app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/tab";
 import { I18nService } from "core-app/core/i18n/i18n.service";
@@ -38,9 +38,8 @@ import { PathHelperService } from "core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class GitHubTabComponent implements TabComponent {
-  @Input() public workPackage:WorkPackageResource;
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
 
-  constructor(readonly PathHelper:PathHelperService,
-              readonly I18n:I18nService) {
-  }
+  @Input() public workPackage:WorkPackageResource;
 }
diff --git a/modules/github_integration/frontend/module/main.ts b/modules/github_integration/frontend/module/main.ts
index abc89b6f876..06e3d3ae503 100644
--- a/modules/github_integration/frontend/module/main.ts
+++ b/modules/github_integration/frontend/module/main.ts
@@ -24,7 +24,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { OpSharedModule } from 'core-app/shared/shared.module';
 import { OpenprojectTabsModule } from 'core-app/shared/components/tabs/openproject-tabs.module';
 import {
@@ -98,7 +98,9 @@ export function initializeGithubIntegrationPlugin(injector:Injector) {
   ],
 })
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeGithubIntegrationPlugin(injector);
     registerCustomElement('opce-github-pull-request', PullRequestMacroComponent, { injector });
   }
diff --git a/modules/github_integration/frontend/module/pull-request/pull-request-macro.component.ts b/modules/github_integration/frontend/module/pull-request/pull-request-macro.component.ts
index bae44cb774a..339aeb525e2 100644
--- a/modules/github_integration/frontend/module/pull-request/pull-request-macro.component.ts
+++ b/modules/github_integration/frontend/module/pull-request/pull-request-macro.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++    Ng1FieldControlsWrapper,
 
-import { ChangeDetectionStrategy, Component, ElementRef, Injector, Input, OnInit, } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Injector, Input, OnInit, inject } from '@angular/core';
 import {
   HalResourceEditingService
 } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
@@ -48,6 +48,11 @@ import { PullRequestState } from './pull-request-state.component';
   standalone: false,
 })
 export class PullRequestMacroComponent implements OnInit {
+  readonly elementRef = inject(ElementRef);
+  readonly injector = inject(Injector);
+  readonly pullRequests = inject(GithubPullRequestResourceService);
+  readonly I18n = inject(I18nService);
+
   @Input() pullRequestId:string;
 
   @Input() pullRequestState:PullRequestState;
@@ -56,12 +61,7 @@ export class PullRequestMacroComponent implements OnInit {
 
   displayText$:Observable<string|null>;
 
-  constructor(
-    readonly elementRef:ElementRef,
-    readonly injector:Injector,
-    readonly pullRequests:GithubPullRequestResourceService,
-    readonly I18n:I18nService,
-  ) {
+  constructor() {
     populateInputsFromDataset(this);
   }
 
diff --git a/modules/github_integration/frontend/module/pull-request/pull-request-state.component.ts b/modules/github_integration/frontend/module/pull-request/pull-request-state.component.ts
index 73819995ba6..8cc84107164 100644
--- a/modules/github_integration/frontend/module/pull-request/pull-request-state.component.ts
+++ b/modules/github_integration/frontend/module/pull-request/pull-request-state.component.ts
@@ -26,12 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 
@@ -47,18 +42,15 @@ export type PullRequestState = 'opened'|'closed'|'referenced'|'ready_for_review'
   standalone: false,
 })
 export class PullRequestStateComponent implements OnInit {
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() state:PullRequestState;
 
   @Input() small = false;
 
   displayText:string;
 
-  constructor(
-    readonly PathHelper:PathHelperService,
-    readonly I18n:I18nService,
-  ) {
-  }
-
   ngOnInit():void {
     this.displayText = this.I18n.t(
       `js.github_integration.pull_requests.states.${this.state}`,
diff --git a/modules/github_integration/frontend/module/pull-request/pull-request.component.ts b/modules/github_integration/frontend/module/pull-request/pull-request.component.ts
index e7bf35fc183..782cf15ca18 100644
--- a/modules/github_integration/frontend/module/pull-request/pull-request.component.ts
+++ b/modules/github_integration/frontend/module/pull-request/pull-request.component.ts
@@ -26,12 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {
@@ -51,6 +46,9 @@ import {
 })
 
 export class PullRequestComponent {
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @HostBinding('class.op-pull-request') className = true;
 
   @Input() public pullRequest:IGithubPullRequest;
@@ -62,12 +60,6 @@ export class PullRequestComponent {
     label_actions: this.I18n.t('js.github_integration.github_actions'),
   };
 
-  constructor(
-    readonly PathHelper:PathHelperService,
-    readonly I18n:I18nService,
-  ) {
-  }
-
   get state():string {
     if (this.pullRequest.state === 'open') {
       return (this.pullRequest.draft ? 'draft' : 'open');
diff --git a/modules/github_integration/frontend/module/tab-header/tab-header.component.ts b/modules/github_integration/frontend/module/tab-header/tab-header.component.ts
index de0ccd025e4..febffe3ea08 100644
--- a/modules/github_integration/frontend/module/tab-header/tab-header.component.ts
+++ b/modules/github_integration/frontend/module/tab-header/tab-header.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { I18nService } from "core-app/core/i18n/i18n.service";
 
@@ -39,6 +39,8 @@ import { I18nService } from "core-app/core/i18n/i18n.service";
   standalone: false,
 })
 export class TabHeaderComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() public workPackage:WorkPackageResource;
 
   public text = {
@@ -48,7 +50,4 @@ export class TabHeaderComponent {
     gitMenuLabel: this.I18n.t('js.github_integration.tab_header.copy_menu.label'),
     gitMenuDescription: this.I18n.t('js.github_integration.tab_header.copy_menu.description'),
   };
-
-  constructor(readonly I18n:I18nService) {
-  }
 }
diff --git a/modules/github_integration/frontend/module/tab-prs/tab-prs.component.ts b/modules/github_integration/frontend/module/tab-prs/tab-prs.component.ts
index ae0825da1d5..d553eacc43e 100644
--- a/modules/github_integration/frontend/module/tab-prs/tab-prs.component.ts
+++ b/modules/github_integration/frontend/module/tab-prs/tab-prs.component.ts
@@ -26,13 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import {
-  ChangeDetectionStrategy,
-  Component,
-  HostBinding,
-  Input,
-  OnInit,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -51,6 +45,10 @@ import { Observable } from 'rxjs';
   standalone: false,
 })
 export class TabPrsComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly githubPullRequests = inject(GithubPullRequestResourceService);
+
   @HostBinding('class.op-github-prs') className = true;
 
   @Input() workPackage:WorkPackageResource;
@@ -59,12 +57,6 @@ export class TabPrsComponent implements OnInit {
 
   emptyText:string;
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly githubPullRequests:GithubPullRequestResourceService,
-  ) {}
-
   ngOnInit():void {
     this.emptyText = this.I18n.t('js.github_integration.tab_prs.empty', { wp_id: this.workPackage.id });
     this.pullRequests$ = this
diff --git a/modules/gitlab_integration/config/locales/crowdin/hy.yml b/modules/gitlab_integration/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..adb7f57189b
--- /dev/null
+++ b/modules/gitlab_integration/config/locales/crowdin/hy.yml
@@ -0,0 +1,82 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) 2023 Ben Tey
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See docs/COPYRIGHT.rdoc for more details.
+#++
+---
+hy:
+  attributes:
+    commit: Commit
+    gitlab: GitLab identifier
+    gitlab_avatar_url: Avatar URL
+    gitlab_email: GitLab Email
+    gitlab_html_url: GitLab HTML URL
+    gitlab_merge_request: Merge Request
+    gitlab_name: GitLab name
+    gitlab_updated_at: Updated at
+    gitlab_user_avatar_url: GitLab avatar URL
+    gitlab_username: GitLab username
+  activerecord:
+    attributes:
+      gitlab_pipeline:
+        ci_details: CI Details
+      gitlab_merge_request:
+        labels: Labels
+    errors:
+      models:
+        gitlab_issue:
+          attributes:
+            labels:
+              invalid_schema: 'must be an array of hashes with keys: color, title'
+        gitlab_merge_request:
+          attributes:
+            labels:
+              invalid_schema: 'must be an array of hashes with keys: color, title'
+  label_gitlab_integration: GitLab Integration
+  label_gitlab_actor: GitLab actor
+  label_gitlab_webhook_secret: Webhook secret
+  text_gitlab_actor_info: 'The OpenProject user whose API key must be used to authenticate incoming webhook requests. When set, requests authenticated with any other user''s credentials are rejected. This user also posts automated comments on work packages. Defaults to the system user when not set.
+
+    '
+  text_gitlab_webhook_secret_info: 'A secret token shared with GitLab when configuring the webhook. When set, OpenProject verifies the X-Gitlab-Token header on every incoming request, rejecting payloads that do not match. Leave blank to skip verification (not recommended).
+
+    '
+  text_gitlab_webhook_secret_missing_warning: 'No webhook secret is configured. Any request to the GitLab webhook endpoint will be accepted without verification, which may allow unauthorized actors to forge events. It is strongly recommended to set a secret.
+
+    '
+  project_module_gitlab: GitLab
+  permission_show_gitlab_content: Show GitLab content
+  gitlab_integration:
+    merge_request_opened_comment: "**MR Opened:** Merge request %{mr_number} [%{mr_title}](%{mr_url}) for [%{repository}](%{repository_url}) has been opened by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    merge_request_closed_comment: "**MR Closed:** Merge request %{mr_number} [%{mr_title}](%{mr_url}) for [%{repository}](%{repository_url}) has been closed by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    merge_request_merged_comment: "**MR Merged:** Merge request %{mr_number} [%{mr_title}](%{mr_url}) for [%{repository}](%{repository_url}) has been merged by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    merge_request_reopened_comment: "**MR Reopened:** Merge request %{mr_number} [%{mr_title}](%{mr_url}) for [%{repository}](%{repository_url}) has been reopened by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    note_commit_referenced_comment: "**Referenced in Commit:** [%{gitlab_user}](%{gitlab_user_url}) referenced this WP in a Commit Note [%{commit_id}](%{commit_url}) on [%{repository}](%{repository_url}): %{commit_note}\n"
+    note_mr_referenced_comment: "**Referenced in MR:** [%{gitlab_user}](%{gitlab_user_url}) referenced this WP in Merge Request %{mr_number} [%{mr_title}](%{mr_url}) on [%{repository}](%{repository_url}): %{mr_note}\n"
+    note_mr_commented_comment: "**Commented in MR:** [%{gitlab_user}](%{gitlab_user_url}) commented this WP in Merge Request %{mr_number} [%{mr_title}](%{mr_url}) on [%{repository}](%{repository_url}): %{mr_note}\n"
+    note_issue_referenced_comment: "**Referenced in Issue:** [%{gitlab_user}](%{gitlab_user_url}) referenced this WP in Issue %{issue_number} [%{issue_title}](%{issue_url}) on [%{repository}](%{repository_url}): %{issue_note}\n"
+    note_issue_commented_comment: "**Commented in Issue:** [%{gitlab_user}](%{gitlab_user_url}) commented this WP in Issue %{issue_number} [%{issue_title}](%{issue_url}) on [%{repository}](%{repository_url}): %{issue_note}\n"
+    note_snippet_referenced_comment: "**Referenced in Snippet:** [%{gitlab_user}](%{gitlab_user_url}) referenced this WP in Snippet %{snippet_number} [%{snippet_title}](%{snippet_url}) on [%{repository}](%{repository_url}): %{snippet_note}\n"
+    issue_opened_referenced_comment: "**Issue Opened:** Issue %{issue_number} [%{issue_title}](%{issue_url}) for [%{repository}](%{repository_url}) has been opened by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    issue_closed_referenced_comment: "**Issue Closed:** Issue %{issue_number} [%{issue_title}](%{issue_url}) for [%{repository}](%{repository_url}) has been closed by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    issue_reopened_referenced_comment: "**Issue Reopened:** Issue %{issue_number} [%{issue_title}](%{issue_url}) for [%{repository}](%{repository_url}) has been reopened by [%{gitlab_user}](%{gitlab_user_url}).\n"
+    push_single_commit_comment: "**Pushed in MR:** [%{gitlab_user}](%{gitlab_user_url}) pushed [%{commit_number}](%{commit_url}) to [%{repository}](%{repository_url}) at %{commit_timestamp}: %{commit_note}\n"
+    push_single_commit_comment_with_ref: "**Pushed in %{reference}:** [%{gitlab_user}](%{gitlab_user_url}) pushed [%{commit_number}](%{commit_url}) to [%{repository}](%{repository_url}) at %{commit_timestamp}: %{commit_note}\n"
+    push_multiple_commits_comment: "**Pushed in MR:** [%{gitlab_user}](%{gitlab_user_url}) pushed multiple commits [%{commit_number}](%{commit_url}) to [%{repository}](%{repository_url}) at %{commit_timestamp}: %{commit_note}\n"
diff --git a/modules/gitlab_integration/config/locales/crowdin/js-hy.yml b/modules/gitlab_integration/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..7ccf6821cec
--- /dev/null
+++ b/modules/gitlab_integration/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,54 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) 2023 Ben Tey
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See docs/COPYRIGHT.rdoc for more details.
+#++
+---
+hy:
+  js:
+    gitlab_integration:
+      work_packages:
+        tab_name: GitLab
+      tab_header_issue:
+        title: Issues
+      tab_header_mr:
+        title: Merge requests
+        create_mr:
+          label: Create MR
+          description: Create a Merge Request
+        copy_menu:
+          label: Git snippets
+          description: Copy git snippets to clipboard
+        git_actions:
+          branch_name: Branch name
+          commit_message: Commit message
+          cmd: Create branch with empty commit
+          title: Quick snippets for Git
+          copy_success: "✅ Copied!"
+          copy_error: "❌ Copy failed!"
+      tab_issue:
+        empty: There are no issues linked yet. Link an existing issue by using the code <code>OP#%{wp_id}</code> (or <code>PP#%{wp_id}</code> for private links) in the issue title/description or create a new issue.
+      tab_mrs:
+        empty: There are no merge requests linked yet. Link an existing MR by using the code <code>OP#%{wp_id}</code> (or <code>PP#%{wp_id}</code> for private links) in the MR title/description or create a new MR.
+      gitlab_pipelines: Pipelines
+      updated_on: Updated on
+    work_packages:
+      tabs:
+        gitlab: GitLab
diff --git a/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts b/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts
index 5c35d566572..83ebf990add 100644
--- a/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts
+++ b/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.component.ts
@@ -28,15 +28,11 @@
 //++
 
 import copy from 'copy-text-to-clipboard';
-import { Component, Inject, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { GitActionsService } from '../git-actions/git-actions.service';
 import { ISnippet } from "core-app/features/plugins/linked/openproject-gitlab_integration/typings";
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { OPContextMenuComponent } from "core-app/shared/components/op-context-menu/op-context-menu.component";
-import {
-  OpContextMenuLocalsMap,
-  OpContextMenuLocalsToken
-} from "core-app/shared/components/op-context-menu/op-context-menu.types";
 import { I18nService } from "core-app/core/i18n/i18n.service";
 
 
@@ -49,6 +45,9 @@ import { I18nService } from "core-app/core/i18n/i18n.service";
   standalone: false,
 })
 export class GitActionsMenuComponent extends OPContextMenuComponent {
+  readonly I18n = inject(I18nService);
+  readonly gitActions = inject(GitActionsService);
+
   @Input() public workPackage:WorkPackageResource;
 
   public text = {
@@ -85,12 +84,9 @@ export class GitActionsMenuComponent extends OPContextMenuComponent {
     },
   ];
 
-  constructor(@Inject(OpContextMenuLocalsToken)
-              public locals:OpContextMenuLocalsMap,
-              readonly I18n:I18nService,
-              readonly gitActions:GitActionsService) {
-    super(locals);
-    this.workPackage = this.locals.workPackage;
+  constructor() {
+    super();
+    this.workPackage = this.locals.workPackage as WorkPackageResource;
   }
 
   public onCopyButtonClick(snippet:ISnippet):void {
diff --git a/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts b/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts
index b13a59037b3..63caaafe99a 100644
--- a/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts
+++ b/modules/gitlab_integration/frontend/module/git-actions-menu/git-actions-menu.directive.ts
@@ -28,8 +28,7 @@
 //++
 
 import { OpContextMenuItem } from 'core-app/shared/components/op-context-menu/op-context-menu.types';
-import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
-import { Directive, ElementRef, Input } from '@angular/core';
+import { Directive, Input } from '@angular/core';
 import { OpContextMenuTrigger } from 'core-app/shared/components/op-context-menu/handlers/op-context-menu-trigger.directive';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { GitActionsMenuComponent } from './git-actions-menu.component';
@@ -42,11 +41,6 @@ import { GitActionsMenuComponent } from './git-actions-menu.component';
 export class GitActionsMenuDirective extends OpContextMenuTrigger {
   @Input('gitActionsCopyDropdown-workPackage') public workPackage:WorkPackageResource;
 
-  constructor(readonly elementRef:ElementRef,
-              readonly opContextMenu:OPContextMenuService) {
-    super(elementRef, opContextMenu);
-  }
-
   protected open(evt:Event) {
     this.opContextMenu.show(this, evt, GitActionsMenuComponent);
   }
diff --git a/modules/gitlab_integration/frontend/module/gitlab-tab/gitlab-tab.component.ts b/modules/gitlab_integration/frontend/module/gitlab-tab/gitlab-tab.component.ts
index cef09d99e13..2780f238df0 100644
--- a/modules/gitlab_integration/frontend/module/gitlab-tab/gitlab-tab.component.ts
+++ b/modules/gitlab_integration/frontend/module/gitlab-tab/gitlab-tab.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { TabComponent } from "core-app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/tab";
 import { I18nService } from "core-app/core/i18n/i18n.service";
@@ -42,9 +42,8 @@ import { PathHelperService } from "core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class GitlabTabComponent implements TabComponent {
-  @Input() public workPackage:WorkPackageResource;
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
 
-  constructor(readonly PathHelper:PathHelperService,
-              readonly I18n:I18nService) {
-  }
+  @Input() public workPackage:WorkPackageResource;
 }
diff --git a/modules/gitlab_integration/frontend/module/issue/issue.component.ts b/modules/gitlab_integration/frontend/module/issue/issue.component.ts
index d835bd06839..965e09b4ba6 100644
--- a/modules/gitlab_integration/frontend/module/issue/issue.component.ts
+++ b/modules/gitlab_integration/frontend/module/issue/issue.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {IGitlabIssueResource} from 'core-app/features/plugins/linked/openproject-gitlab_integration/typings';
@@ -43,6 +43,9 @@ import {IGitlabIssueResource} from 'core-app/features/plugins/linked/openproject
 })
 
 export class IssueComponent {
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() public gitlabIssue:IGitlabIssueResource;
 
   public text = {
@@ -51,10 +54,6 @@ export class IssueComponent {
     label_details: this.I18n.t('js.label_details'),
   };
 
-  constructor(readonly PathHelper:PathHelperService,
-              readonly I18n:I18nService) {
-  }
-
   get state() {
 
     if (this.gitlabIssue.state === 'opened') {
diff --git a/modules/gitlab_integration/frontend/module/main.ts b/modules/gitlab_integration/frontend/module/main.ts
index 3b532e10086..115affd6179 100644
--- a/modules/gitlab_integration/frontend/module/main.ts
+++ b/modules/gitlab_integration/frontend/module/main.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject } from '@angular/core';
 import { OpSharedModule } from 'core-app/shared/shared.module';
 import { OpenprojectTabsModule } from 'core-app/shared/components/tabs/openproject-tabs.module';
 import {
@@ -116,7 +116,9 @@ export function initializeGitlabIntegrationPlugin(injector:Injector) {
   ],
 })
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeGitlabIntegrationPlugin(injector);
   }
 }
diff --git a/modules/gitlab_integration/frontend/module/merge-request/merge-request.component.ts b/modules/gitlab_integration/frontend/module/merge-request/merge-request.component.ts
index 64dcdfe606d..b3ecca8b989 100644
--- a/modules/gitlab_integration/frontend/module/merge-request/merge-request.component.ts
+++ b/modules/gitlab_integration/frontend/module/merge-request/merge-request.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import {IGitlabMergeRequestResource} from 'core-app/features/plugins/linked/openproject-gitlab_integration/typings';
@@ -44,6 +44,9 @@ import {IGitlabMergeRequestResource} from 'core-app/features/plugins/linked/open
 })
 
 export class MergeRequestComponent {
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() public mergeRequest:IGitlabMergeRequestResource;
 
   public text = {
@@ -53,10 +56,6 @@ export class MergeRequestComponent {
     label_pipelines: this.I18n.t('js.gitlab_integration.gitlab_pipelines'),
   };
 
-  constructor(readonly PathHelper:PathHelperService,
-              readonly I18n:I18nService) {
-  }
-
   get state() {
 
     if (this.mergeRequest.state === 'opened') {
diff --git a/modules/gitlab_integration/frontend/module/tab-header-issue/tab-header-issue.component.ts b/modules/gitlab_integration/frontend/module/tab-header-issue/tab-header-issue.component.ts
index bc1a26da867..97f85e1b770 100644
--- a/modules/gitlab_integration/frontend/module/tab-header-issue/tab-header-issue.component.ts
+++ b/modules/gitlab_integration/frontend/module/tab-header-issue/tab-header-issue.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { I18nService } from "core-app/core/i18n/i18n.service";
 
@@ -40,12 +40,11 @@ import { I18nService } from "core-app/core/i18n/i18n.service";
   standalone: false,
 })
 export class TabHeaderIssueComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() public workPackage:WorkPackageResource;
 
   public text = {
     title: this.I18n.t('js.gitlab_integration.tab_header_issue.title'),
   };
-
-  constructor(readonly I18n:I18nService) {
-  }
 }
diff --git a/modules/gitlab_integration/frontend/module/tab-header-mr/tab-header-mr.component.ts b/modules/gitlab_integration/frontend/module/tab-header-mr/tab-header-mr.component.ts
index 25c5e99b443..53c50f40e02 100644
--- a/modules/gitlab_integration/frontend/module/tab-header-mr/tab-header-mr.component.ts
+++ b/modules/gitlab_integration/frontend/module/tab-header-mr/tab-header-mr.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { I18nService } from "core-app/core/i18n/i18n.service";
 
@@ -40,6 +40,8 @@ import { I18nService } from "core-app/core/i18n/i18n.service";
   standalone: false,
 })
 export class TabHeaderMrsComponent {
+  readonly I18n = inject(I18nService);
+
   @Input() public workPackage:WorkPackageResource;
 
   public text = {
@@ -49,7 +51,4 @@ export class TabHeaderMrsComponent {
     gitMenuLabel: this.I18n.t('js.gitlab_integration.tab_header_mr.copy_menu.label'),
     gitMenuDescription: this.I18n.t('js.gitlab_integration.tab_header_mr.copy_menu.description'),
   };
-
-  constructor(readonly I18n:I18nService) {
-  }
 }
diff --git a/modules/gitlab_integration/frontend/module/tab-issue/tab-issue.component.ts b/modules/gitlab_integration/frontend/module/tab-issue/tab-issue.component.ts
index 4b4fbcdae53..a26de1027bc 100644
--- a/modules/gitlab_integration/frontend/module/tab-issue/tab-issue.component.ts
+++ b/modules/gitlab_integration/frontend/module/tab-issue/tab-issue.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { HalResourceService } from "core-app/features/hal/services/hal-resource.service";
 import { CollectionResource } from "core-app/features/hal/resources/collection-resource";
@@ -42,17 +42,15 @@ import {ApiV3Service} from "core-app/core/apiv3/api-v3.service";
   standalone: false,
 })
 export class TabIssueComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly halResourceService = inject(HalResourceService);
+  readonly changeDetector = inject(ChangeDetectorRef);
+
   @Input() public workPackage:WorkPackageResource;
 
   public gitlabIssues:IGitlabIssueResource[] = [];
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly halResourceService:HalResourceService,
-    readonly changeDetector:ChangeDetectorRef,
-  ) {}
-
   ngOnInit(): void {
     const basePath = this.apiV3Service.work_packages.id(this.workPackage.id as string).path;
     const gitlabIssuePath = `${basePath}/gitlab_issues`;
diff --git a/modules/gitlab_integration/frontend/module/tab-issue/wp-gitlab-issue.service.ts b/modules/gitlab_integration/frontend/module/tab-issue/wp-gitlab-issue.service.ts
index 28d236668c0..729b9376f96 100644
--- a/modules/gitlab_integration/frontend/module/tab-issue/wp-gitlab-issue.service.ts
+++ b/modules/gitlab_integration/frontend/module/tab-issue/wp-gitlab-issue.service.ts
@@ -29,16 +29,14 @@
 
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { HalResource } from "core-app/features/hal/resources/hal-resource";
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ConfigurationService } from "core-app/core/config/configuration.service";
 import { WorkPackageLinkedResourceCache } from 'core-app/features/work-packages/components/wp-single-view-tabs/wp-linked-resource-cache.service';
 
 @Injectable()
 export class WorkPackagesGitlabIssueService extends WorkPackageLinkedResourceCache<HalResource[]> {
+  ConfigurationService = inject(ConfigurationService);
 
-  constructor(public ConfigurationService:ConfigurationService) {
-    super();
-  }
 
   protected load(workPackage:WorkPackageResource):Promise<HalResource[]> {
     return workPackage.gitlab_issues.$update().then((data:any) => {
diff --git a/modules/gitlab_integration/frontend/module/tab-mrs/tab-mrs.component.ts b/modules/gitlab_integration/frontend/module/tab-mrs/tab-mrs.component.ts
index 4cae77cf359..24869c3c275 100644
--- a/modules/gitlab_integration/frontend/module/tab-mrs/tab-mrs.component.ts
+++ b/modules/gitlab_integration/frontend/module/tab-mrs/tab-mrs.component.ts
@@ -27,7 +27,7 @@
 // See docs/COPYRIGHT.rdoc for more details.
 //++
 
-import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit, inject } from '@angular/core';
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { HalResourceService } from "core-app/features/hal/services/hal-resource.service";
 import { CollectionResource } from "core-app/features/hal/resources/collection-resource";
@@ -42,17 +42,15 @@ import {ApiV3Service} from "core-app/core/apiv3/api-v3.service";
   standalone: false,
 })
 export class TabMrsComponent implements OnInit {
+  readonly I18n = inject(I18nService);
+  readonly apiV3Service = inject(ApiV3Service);
+  readonly halResourceService = inject(HalResourceService);
+  readonly changeDetector = inject(ChangeDetectorRef);
+
   @Input() public workPackage:WorkPackageResource;
 
   public mergeRequests:IGitlabMergeRequestResource[] = [];
 
-  constructor(
-    readonly I18n:I18nService,
-    readonly apiV3Service:ApiV3Service,
-    readonly halResourceService:HalResourceService,
-    readonly changeDetector:ChangeDetectorRef,
-  ) {}
-
   ngOnInit(): void {
     const basePath = this.apiV3Service.work_packages.id(this.workPackage.id as string).path;
     const mergeRequestsPath = `${basePath}/gitlab_merge_requests`;
diff --git a/modules/gitlab_integration/frontend/module/tab-mrs/wp-gitlab-mrs.service.ts b/modules/gitlab_integration/frontend/module/tab-mrs/wp-gitlab-mrs.service.ts
index dab5e7f528d..3c8d1fa8e3c 100644
--- a/modules/gitlab_integration/frontend/module/tab-mrs/wp-gitlab-mrs.service.ts
+++ b/modules/gitlab_integration/frontend/module/tab-mrs/wp-gitlab-mrs.service.ts
@@ -29,16 +29,14 @@
 
 import { WorkPackageResource } from "core-app/features/hal/resources/work-package-resource";
 import { HalResource } from "core-app/features/hal/resources/hal-resource";
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ConfigurationService } from "core-app/core/config/configuration.service";
 import { WorkPackageLinkedResourceCache } from 'core-app/features/work-packages/components/wp-single-view-tabs/wp-linked-resource-cache.service';
 
 @Injectable()
 export class WorkPackagesGitlabMrsService extends WorkPackageLinkedResourceCache<HalResource[]> {
+  ConfigurationService = inject(ConfigurationService);
 
-  constructor(public ConfigurationService:ConfigurationService) {
-    super();
-  }
 
   protected load(workPackage:WorkPackageResource):Promise<HalResource[]> {
     return workPackage.gitlab_merge_requests.$update().then((data:any) => {
diff --git a/modules/grids/config/locales/crowdin/hy.yml b/modules/grids/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..ffa5ea23286
--- /dev/null
+++ b/modules/grids/config/locales/crowdin/hy.yml
@@ -0,0 +1,36 @@
+---
+hy:
+  grids:
+    label_widget_in_grid: Widget contained in Grid %{grid_name}
+    widgets:
+      empty: This widget is currently empty.
+      not_available: This widget is not available.
+      subitems:
+        title: Subitems
+        no_results: There are no visible children.
+        view_all_subitems: View all subitems
+        button_text: Subitem
+      members:
+        title: Members
+        no_results: No visible members.
+        view_all_members: View all members
+        show_members_count: Show all %{count} members
+        x_more:
+          one: and one more member.
+          other: and %{count} more members.
+      news:
+        no_results: Nothing new to report.
+  activerecord:
+    attributes:
+      grids/grid:
+        page: Page
+        row_count: Number of rows
+        column_count: Number of columns
+        widgets: Widgets
+        scope: Scope
+    errors:
+      models:
+        grids/grid:
+          overlaps: overlap.
+          outside: is outside of the grid.
+          end_before_start: end value needs to be larger than the start value.
diff --git a/modules/grids/config/locales/crowdin/js-hy.yml b/modules/grids/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..f7bd0277a1e
--- /dev/null
+++ b/modules/grids/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,60 @@
+---
+hy:
+  js:
+    grid:
+      add_widget: Add widget
+      widget_menu_label: Show menu options for %{widgetName} widget
+      remove: Remove widget
+      configure: Configure widget
+      widgets:
+        missing_permission: You don't have the necessary permissions to view this widget.
+        not_available: This widget is currently unavailable.
+        custom_text:
+          title: Custom text
+        documents:
+          title: Documents
+          no_results: No documents yet.
+        members:
+          title: Members
+        news:
+          title: News
+        project_description:
+          title: Description
+        project_status:
+          title: Status
+          not_started: Not started
+          on_track: On track
+          off_track: Off track
+          at_risk: At risk
+          not_set: Not set
+          finished: Finished
+          discontinued: Discontinued
+        subprojects:
+          title: Subitems
+        project_favorites:
+          title: Favorite projects
+          no_results: You currently have no favorite projects. Click on the star icon in the project dashboard to add one to your favorites.
+        time_entries_current_user:
+          title: My spent time
+          displayed_days: 'Days displayed in the widget:'
+        time_entries_list:
+          title: Spent time (last 7 days)
+          no_results: No time entries for the last 7 days.
+        work_packages_accountable:
+          title: Work packages I am accountable for
+        work_packages_assigned:
+          title: Work packages assigned to me
+        work_packages_created:
+          title: Work packages created by me
+        work_packages_watched:
+          title: Work packages watched by me
+        work_packages_table:
+          title: Work packages table
+        work_packages_graph:
+          title: Work packages graph
+          summary: "%{chartType} chart showing work packages which are %{description}."
+        work_packages_calendar:
+          title: Calendar
+        work_packages_overview:
+          title: Work packages overview
+          placeholder: Click to edit ...
diff --git a/modules/job_status/config/locales/crowdin/hy.yml b/modules/job_status/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..ab0398ccb96
--- /dev/null
+++ b/modules/job_status/config/locales/crowdin/hy.yml
@@ -0,0 +1,21 @@
+---
+hy:
+  label_job_status_plural: Job statuses
+  plugin_openproject_job_status:
+    name: OpenProject Job status
+    description: Listing and status of background jobs.
+  job_status_dialog:
+    download_starts: The download should start automatically.
+    click_to_download: Or [click here](download_url) to download.
+    title: Background job status
+    redirect: You are being redirected.
+    redirect_link: Please click here to continue.
+    redirect_errors: Due to these errors, you will not be redirected automatically.
+    errors: Something went wrong
+    generic_messages:
+      not_found: This job could not be found.
+      in_queue: The job has been queued and will be processed shortly.
+      in_process: The job is currently being processed.
+      error: The job has failed to complete.
+      cancelled: The job has been cancelled due to an error.
+      success: The job completed successfully.
diff --git a/modules/ldap_groups/config/locales/crowdin/hy.yml b/modules/ldap_groups/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..26b2330721e
--- /dev/null
+++ b/modules/ldap_groups/config/locales/crowdin/hy.yml
@@ -0,0 +1,84 @@
+---
+hy:
+  ee:
+    upsell:
+      ldap_groups:
+        title: LDAP group synchronization
+        description: Synchronize LDAP groups with OpenProject groups to manage users, change their permissions and facilitate user management across groups.
+  plugin_openproject_ldap_groups:
+    name: OpenProject LDAP groups
+    description: Synchronization of LDAP group memberships.
+  activerecord:
+    attributes:
+      ldap_groups/synchronized_group:
+        dn: DN
+        auth_source: Auth source
+        ldap_auth_source: LDAP connection
+        sync_users: Sync users
+      ldap_groups/synchronized_filter:
+        filter_string: LDAP filter
+        auth_source: Auth source
+        ldap_auth_source: LDAP connection
+        group_name_attribute: Group name attribute
+        sync_users: Sync users
+        base_dn: Search base DN
+    models:
+      ldap_groups/synchronized_group: Synchronized LDAP group
+      ldap_groups/synchronized_filter: LDAP Group synchronization filter
+    errors:
+      models:
+        ldap_groups/synchronized_filter:
+          must_contain_base_dn: Filter base DN must be contained within the LDAP connection's base DN
+  ldap_groups:
+    label_menu_item: LDAP group synchronization
+    label_group_key: LDAP group filter key
+    label_synchronize: Synchronize
+    settings:
+      name_attribute: LDAP groups name attribute
+      name_attribute_text: The LDAP attribute used for naming the OpenProject group when created by a filter
+    synchronized_filters:
+      add_new: Add synchronized LDAP filter
+      singular: LDAP Group synchronization filter
+      plural: LDAP Group synchronization filters
+      label_n_groups_found:
+        one: 1 group found by the filter
+        other: "%{count} groups found by the filter"
+        zero: No groups were found by the filter
+      destroy:
+        title: Remove synchronized filter %{name}
+        heading: Remove synchronized filter %{name}?
+        confirmation: If you continue, the synchronized filter %{name} and all groups %{groups_count} created through it will be removed.
+        removed_groups: 'Warning: This will remove the following groups from OpenProject and remove it from all projects!'
+        verification_html: Enter the filter name %{name} to verify the deletion.
+      form:
+        group_name_attribute_text: Enter the attribute of the LDAP group used for setting the OpenProject group name.
+        filter_string_text: Enter the RFC4515 LDAP filter that returns groups in your LDAP to synchronize with OpenProject.
+        base_dn_text: 'Enter the search base DN to use for this filter. It needs to be below the base DN of the selected LDAP connection. Leave this option empty to reuse the base DN of the connection
+
+          '
+    synchronized_groups:
+      add_new: Add synchronized LDAP group
+      destroy:
+        title: Remove synchronized group %{name}
+        heading: Remove synchronized group %{name}?
+        confirmation: If you continue, the synchronized group %{name} and all %{users_count} users synchronized through it will be removed.
+        info: The OpenProject group itself and members added outside this LDAP synchronization will not be removed.
+      help_text_html: |
+        This module allows you to set up a synchronization between LDAP and OpenProject groups.
+        It depends on LDAP groups need to use the <em>groupOfNames / memberOf</em> attribute set to be working with OpenProject.
+        <br/>
+        Groups are synchronized hourly through a cron job.
+        [Please see our documentation on this topic](docs_url).
+      no_results: No synchronized groups found.
+      no_members: This group has no synchronized members yet.
+      plural: Synchronized LDAP groups
+      singular: Synchronized LDAP group
+      form:
+        auth_source_text: Select which LDAP connection should be used.
+        sync_users_text: 'If you enable this option, found users will also be automatically created in OpenProject. Without it, only existing accounts in OpenProject will be added to groups.
+
+          '
+        dn_text: Enter the full DN of the group in LDAP
+        group_text: Select an existing OpenProject group that members of the LDAP group shall be synchronized with
+      upsell:
+        description: Take advantage of synchronised LDAP groups to manage users, change their permissions and facilitate user management across groups.
diff --git a/modules/meeting/app/controllers/meeting_participants_controller.rb b/modules/meeting/app/controllers/meeting_participants_controller.rb
index f62795210ab..a17ecfb93fe 100644
--- a/modules/meeting/app/controllers/meeting_participants_controller.rb
+++ b/modules/meeting/app/controllers/meeting_participants_controller.rb
@@ -125,7 +125,7 @@ class MeetingParticipantsController < ApplicationController
       next unless participant
 
       MeetingParticipants::DeleteService
-        .new(user: User.current, model: participant)
+        .new(user: User.current, model: participant, notify: false)
         .call
     end
   end
@@ -136,7 +136,7 @@ class MeetingParticipantsController < ApplicationController
         next if meeting.participants.exists?(user_id:)
 
         MeetingParticipants::CreateService
-          .new(user: User.current)
+          .new(user: User.current, notify: false)
           .call(meeting:, user_id:, invited: true, attended: false)
       end
     end
diff --git a/modules/meeting/app/forms/meeting/add_to_section.rb b/modules/meeting/app/forms/meeting/add_to_section.rb
index 20c4b16532c..e6a4547d860 100644
--- a/modules/meeting/app/forms/meeting/add_to_section.rb
+++ b/modules/meeting/app/forms/meeting/add_to_section.rb
@@ -77,6 +77,7 @@ class Meeting::AddToSection < ApplicationForm
 
     items.concat(meeting.sections) if meeting.present? && @occurrence.nil?
     items.concat(@occurrence.sections) if @occurrence.present?
+    items.push(MeetingSection.new) if items.empty?
     items.push(meeting.backlog) if meeting.present? && !meeting.template? && meeting.backlog.present?
 
     items.reject! { |i| i == @selected_section } if @selected_section.present?
diff --git a/modules/meeting/app/mailers/meeting_mailer.rb b/modules/meeting/app/mailers/meeting_mailer.rb
index 415cea5406e..0fbdba7e0cf 100644
--- a/modules/meeting/app/mailers/meeting_mailer.rb
+++ b/modules/meeting/app/mailers/meeting_mailer.rb
@@ -45,11 +45,13 @@ class MeetingMailer < UserMailer
     end
   end
 
-  def updated(meeting, user, actor, changes:)
+  def updated(meeting, user, actor, changes:, added_participants: [], removed_participants: [])
     @actor = actor
     @user = user
     @meeting = meeting
     @changes = changes
+    @added_participants = Array(added_participants)
+    @removed_participants = Array(removed_participants)
 
     open_project_headers "Project" => @meeting.project.identifier,
                          "Meeting-Id" => @meeting.id
@@ -117,36 +119,6 @@ class MeetingMailer < UserMailer
     end
   end
 
-  def participant_added(meeting, user, actor, added_participant:)
-    @actor = actor
-    @meeting = meeting
-    @user = user
-    @added_participant = added_participant
-
-    open_project_headers "Project" => @meeting.project.identifier,
-                         "Meeting-Id" => @meeting.id
-
-    with_attached_ics(meeting, user) do
-      subject = I18n.t("meeting.email.participant_added.header", title: @meeting.title)
-      mail(to: user, subject: "[#{@meeting.project.name}] #{subject}")
-    end
-  end
-
-  def participant_removed(meeting, user, actor, removed_participant:)
-    @actor = actor
-    @meeting = meeting
-    @user = user
-    @removed_participant = removed_participant
-
-    open_project_headers "Project" => @meeting.project.identifier,
-                         "Meeting-Id" => @meeting.id
-
-    with_attached_ics(meeting, user) do
-      subject = I18n.t("meeting.email.participant_removed.header", title: @meeting.title)
-      mail(to: user, subject: "[#{@meeting.project.name}] #{subject}")
-    end
-  end
-
   private
 
   def with_attached_ics(meeting, user, **args)
diff --git a/modules/meeting/app/mailers/meeting_series_mailer.rb b/modules/meeting/app/mailers/meeting_series_mailer.rb
index 8c3e0a324e7..8563718d119 100644
--- a/modules/meeting/app/mailers/meeting_series_mailer.rb
+++ b/modules/meeting/app/mailers/meeting_series_mailer.rb
@@ -46,11 +46,13 @@ class MeetingSeriesMailer < UserMailer
     end
   end
 
-  def updated(series, user, actor, changes:)
+  def updated(series, user, actor, changes:, added_participants: [], removed_participants: [])
     @actor = actor
     @series = series
     @user = user
     @changes = changes
+    @added_participants = Array(added_participants)
+    @removed_participants = Array(removed_participants)
 
     set_headers(series)
 
@@ -60,36 +62,6 @@ class MeetingSeriesMailer < UserMailer
     end
   end
 
-  def participant_added(series, user, actor, added_participant:)
-    @actor = actor
-    @series = series
-    @template = series.template
-    @user = user
-    @added_participant = added_participant
-
-    set_headers(series)
-
-    with_attached_ics(series, user) do
-      subject = I18n.t("meeting.email.participant_added.header_series", title: series.title)
-      mail(to: user, subject: "[#{@series.project.name}] #{subject}")
-    end
-  end
-
-  def participant_removed(series, user, actor, removed_participant:)
-    @actor = actor
-    @series = series
-    @template = series.template
-    @user = user
-    @removed_participant = removed_participant
-
-    set_headers(series)
-
-    with_attached_ics(series, user) do
-      subject = I18n.t("meeting.email.participant_removed.header_series", title: series.title)
-      mail(to: user, subject: "[#{@series.project.name}] #{subject}")
-    end
-  end
-
   private
 
   def with_attached_ics(series, user, cancelled: false)
diff --git a/modules/meeting/app/models/activities/meeting_event_mapper.rb b/modules/meeting/app/models/activities/meeting_event_mapper.rb
index 79e84fd08d8..85163737dd9 100644
--- a/modules/meeting/app/models/activities/meeting_event_mapper.rb
+++ b/modules/meeting/app/models/activities/meeting_event_mapper.rb
@@ -177,7 +177,7 @@ class Activities::MeetingEventMapper < Activities::EventMapper
       )
   end
 
-  def filtered_meeting_details(details)
+  def filtered_meeting_details(details) # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
     details
       .reject { |key, _| key.start_with?("agenda_items_") && !key.end_with?("_position") }
       .reject { |key, value| key.end_with?("_position") && value.first.nil? }
@@ -212,7 +212,7 @@ class Activities::MeetingEventMapper < Activities::EventMapper
   end
 
   def journals_includes
-    super + %i[agenda_item_journals]
+    super + [{ participant_journals: :user }, :agenda_item_journals]
   end
 
   def url_helpers
diff --git a/modules/meeting/app/models/journal/meeting_participant_journal.rb b/modules/meeting/app/models/journal/meeting_participant_journal.rb
new file mode 100644
index 00000000000..91e3daf07bf
--- /dev/null
+++ b/modules/meeting/app/models/journal/meeting_participant_journal.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Journal::MeetingParticipantJournal < ApplicationRecord
+  self.table_name = "meeting_participant_journals"
+
+  belongs_to :journal
+  belongs_to :user
+
+  enum :participation_status, MeetingParticipant.participation_statuses, allow_nil: true
+end
diff --git a/modules/meeting/app/models/meeting.rb b/modules/meeting/app/models/meeting.rb
index 9c0517755e1..81a32364bc9 100644
--- a/modules/meeting/app/models/meeting.rb
+++ b/modules/meeting/app/models/meeting.rb
@@ -133,7 +133,7 @@ class Meeting < ApplicationRecord
 
   before_save :add_new_participants_as_watcher
 
-  after_update :send_updated_mail, if: -> {
+  after_commit :send_updated_mail, on: :update, if: -> {
     !template? &&
       (saved_change_to_start_time? || saved_change_to_duration? || saved_change_to_location? || saved_change_to_title?)
   }
@@ -152,6 +152,12 @@ class Meeting < ApplicationRecord
     system: "system"
   }, prefix: :sharing, validate: { allow_nil: true }
 
+  # Debounce meeting emails by one minute
+  # this is currently hard coded
+  def self.journal_aggregation_time_minutes
+    1
+  end
+
   def self.templates_visible_in_project(project, user = User.current)
     accessible_ids = Project.allowed_to(user, :view_meetings).select(:id)
 
@@ -341,22 +347,18 @@ class Meeting < ApplicationRecord
   def send_updated_mail
     return unless send_emails?
 
-    MeetingNotificationService
-      .new(self)
-      .call :updated,
-            changes: updated_mail_changes
+    Meetings::NotificationDebounceJob.debounce(
+      self,
+      since_journal_id: last_journal&.predecessor&.id,
+      since_invited_ids: participants.invited.pluck(:user_id),
+      since_attributes: updated_mail_since_attributes
+    )
   end
 
-  def updated_mail_changes # rubocop:disable Metrics/AbcSize
-    {
-      old_start: saved_change_to_start_time? ? saved_change_to_start_time.first : start_time,
-      new_start: start_time,
-      old_duration: saved_change_to_duration? ? saved_change_to_duration.first : duration,
-      new_duration: duration,
-      old_location: saved_change_to_location? ? saved_change_to_location.first : location,
-      new_location: location,
-      old_title: saved_change_to_title? ? saved_change_to_title.first : title,
-      new_title: title
-    }
+  def updated_mail_since_attributes
+    %w[title location start_time duration].index_with do |attribute|
+      value = saved_change_to_attribute(attribute)&.first || public_send(attribute)
+      value.respond_to?(:iso8601) ? value.iso8601 : value
+    end
   end
 end
diff --git a/modules/meeting/app/models/meeting/journalized.rb b/modules/meeting/app/models/meeting/journalized.rb
index e4db65d8fd0..d9f7d770b1a 100644
--- a/modules/meeting/app/models/meeting/journalized.rb
+++ b/modules/meeting/app/models/meeting/journalized.rb
@@ -47,6 +47,8 @@ module Meeting::Journalized
     register_journal_formatted_fields "start_date", formatter_key: :datetime
     register_journal_formatted_fields "start_time", formatter_key: :meeting_start_time
     register_journal_formatted_fields "state", formatter_key: :meeting_state
+    register_journal_formatted_fields "participants_invited", "participants_attended", formatter_key: :plaintext
+    register_journal_formatted_fields "participants_added", "participants_removed", formatter_key: :participant_change
 
     register_journal_formatted_fields "duration", formatter_key: :agenda_item_duration
     register_journal_formatted_fields /\Aagenda_items_\d+_notes\z/, formatter_key: :agenda_item_diff
diff --git a/app/services/journals/create_service/agenda_itemable.rb b/modules/meeting/app/services/journals/create_service/agenda_itemable.rb
similarity index 100%
rename from app/services/journals/create_service/agenda_itemable.rb
rename to modules/meeting/app/services/journals/create_service/agenda_itemable.rb
diff --git a/modules/meeting/app/services/journals/create_service/participatable.rb b/modules/meeting/app/services/journals/create_service/participatable.rb
new file mode 100644
index 00000000000..34b687335ea
--- /dev/null
+++ b/modules/meeting/app/services/journals/create_service/participatable.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Journals::CreateService
+  class Participatable < Association
+    def associated?
+      journable.respond_to?(:participants)
+    end
+
+    def cleanup_predecessor(predecessor, notes, cause)
+      cleanup_predecessor_for(predecessor,
+                              notes,
+                              cause,
+                              "meeting_participant_journals",
+                              :journal_id,
+                              :id)
+    end
+
+    def insert_sql
+      sanitize(<<~SQL.squish, journable_id:)
+        INSERT INTO
+          meeting_participant_journals (
+            journal_id,
+            user_id,
+            invited,
+            attended,
+            participation_status
+          )
+        SELECT
+          #{id_from_inserted_journal_sql},
+          participants.user_id,
+          COALESCE(participants.invited, false),
+          COALESCE(participants.attended, false),
+          participants.participation_status
+        FROM meeting_participants participants
+        WHERE
+          #{only_if_created_sql}
+          AND participants.meeting_id = :journable_id
+        ON CONFLICT (journal_id, user_id) DO UPDATE SET
+          invited = EXCLUDED.invited,
+          attended = EXCLUDED.attended,
+          participation_status = EXCLUDED.participation_status
+      SQL
+    end
+
+    def changes_sql
+      sanitize(<<~SQL.squish, journable_id:)
+        SELECT
+          max_journals.journable_id
+        FROM
+          max_journals
+        LEFT OUTER JOIN
+          meeting_participant_journals
+        ON
+          meeting_participant_journals.journal_id = max_journals.id
+        FULL JOIN
+          (SELECT *
+           FROM meeting_participants
+           WHERE meeting_participants.meeting_id = :journable_id) participants
+        ON
+          participants.user_id = meeting_participant_journals.user_id
+        WHERE
+          (participants.user_id IS DISTINCT FROM meeting_participant_journals.user_id)
+          OR (participants.invited IS DISTINCT FROM meeting_participant_journals.invited)
+          OR (participants.attended IS DISTINCT FROM meeting_participant_journals.attended)
+          OR (participants.participation_status IS DISTINCT FROM meeting_participant_journals.participation_status)
+      SQL
+    end
+  end
+end
diff --git a/modules/meeting/app/services/meeting_participants/create_service.rb b/modules/meeting/app/services/meeting_participants/create_service.rb
index eab08c3de75..012ef722f56 100644
--- a/modules/meeting/app/services/meeting_participants/create_service.rb
+++ b/modules/meeting/app/services/meeting_participants/create_service.rb
@@ -29,52 +29,23 @@
 #++
 module MeetingParticipants
   class CreateService < BaseServices::Create
+    def initialize(user:, model: nil, contract_class: nil, contract_options: {}, notify: true)
+      @notify = notify
+      super(user:, model:, contract_class:, contract_options:)
+    end
+
     protected
 
     def after_perform(call)
-      send_notification call.result
+      meeting = call.result.meeting
+      meeting.touch_and_save_journals
+
+      if @notify
+        since_invited_ids = meeting.participants.where(invited: true).where.not(id: call.result.id).pluck(:user_id)
+        Meetings::NotificationDebounceJob.debounce(meeting, since_invited_ids:)
+      end
 
       call
     end
-
-    def send_notification(meeting_participant)
-      meeting = meeting_participant.meeting
-
-      if Journal::NotificationConfiguration.active? && meeting.send_emails?
-        send_meeting_invite(meeting, meeting_participant)
-        notify_other_participants(meeting, meeting_participant)
-      end
-    end
-
-    def send_meeting_invite(meeting, participant)
-      if meeting.template?
-        MeetingSeriesMailer.invited(meeting.recurring_meeting, participant.user, user).deliver_later
-      else
-        MeetingMailer.invited(meeting, participant.user, user).deliver_later
-      end
-    end
-
-    def notify_other_participants(meeting, new_participant)
-      added_participant_name = new_participant.user.name
-
-      meeting
-        .participants
-        .invited
-        .where.not(id: new_participant.id)
-        .includes(:user)
-        .find_each do |participant|
-          send_participant_added_notification(meeting, participant.user, added_participant_name)
-      end
-    end
-
-    def send_participant_added_notification(meeting, recipient, added_participant_name)
-      if meeting.template?
-        MeetingSeriesMailer.participant_added(meeting.recurring_meeting, recipient, user,
-                                              added_participant: added_participant_name).deliver_later
-      else
-        MeetingMailer.participant_added(meeting, recipient, user,
-                                        added_participant: added_participant_name).deliver_later
-      end
-    end
   end
 end
diff --git a/modules/meeting/app/services/meeting_participants/delete_service.rb b/modules/meeting/app/services/meeting_participants/delete_service.rb
index 7198cb591f1..c0dfd00987d 100644
--- a/modules/meeting/app/services/meeting_participants/delete_service.rb
+++ b/modules/meeting/app/services/meeting_participants/delete_service.rb
@@ -30,57 +30,24 @@
 
 module MeetingParticipants
   class DeleteService < BaseServices::Delete
+    def initialize(user:, model:, contract_class: nil, contract_options: {}, notify: true)
+      @notify = notify
+      super(user:, model:, contract_class:, contract_options:)
+    end
+
     protected
 
-    def after_validate(call)
-      send_notifications if should_send_notification?
+    def after_perform(call)
+      meeting = model.meeting
+      meeting.touch_and_save_journals
+
+      if @notify
+        since_invited_ids = meeting.participants.where(invited: true).pluck(:user_id)
+        since_invited_ids |= [model.user_id] if model.invited?
+        Meetings::NotificationDebounceJob.debounce(meeting, since_invited_ids:)
+      end
 
       call
     end
-
-    def send_notifications
-      remaining_participants = fetch_remaining_participants
-
-      send_cancellation_notification(model)
-      notify_remaining_participants(model.meeting, remaining_participants, model.user)
-    end
-
-    def fetch_remaining_participants
-      model.meeting.participants.invited
-           .where.not(id: model.id)
-           .includes(:user).to_a
-    end
-
-    def send_cancellation_notification(participant)
-      meeting = participant.meeting
-
-      if meeting.template?
-        MeetingMailer.cancelled_series(meeting.recurring_meeting, participant.user, user).deliver_later
-      else
-        MeetingMailer.cancelled(meeting, participant.user, user).deliver_later
-      end
-    end
-
-    def notify_remaining_participants(meeting, remaining_participants, removed_user)
-      removed_participant_name = removed_user.name
-
-      remaining_participants.each do |participant|
-        send_participant_removed_notification(meeting, participant.user, removed_participant_name)
-      end
-    end
-
-    def send_participant_removed_notification(meeting, recipient, removed_participant_name)
-      if meeting.template?
-        MeetingSeriesMailer.participant_removed(meeting.recurring_meeting, recipient, user,
-                                                removed_participant: removed_participant_name).deliver_later
-      else
-        MeetingMailer.participant_removed(meeting, recipient, user,
-                                          removed_participant: removed_participant_name).deliver_later
-      end
-    end
-
-    def should_send_notification?
-      Journal::NotificationConfiguration.active? && model.meeting.send_emails?
-    end
   end
 end
diff --git a/modules/meeting/app/services/meetings/delete_service.rb b/modules/meeting/app/services/meetings/delete_service.rb
index 633712ae3a3..9973aff4b38 100644
--- a/modules/meeting/app/services/meetings/delete_service.rb
+++ b/modules/meeting/app/services/meetings/delete_service.rb
@@ -33,6 +33,7 @@ module Meetings
     protected
 
     def after_validate(call)
+      Meetings::NotificationDebounceJob.cancel_pending(model)
       send_cancellation_mail(model) if model.notify?
 
       call
diff --git a/modules/meeting/app/services/meetings/dispatch_aggregated_notifications_service.rb b/modules/meeting/app/services/meetings/dispatch_aggregated_notifications_service.rb
new file mode 100644
index 00000000000..0c07604d107
--- /dev/null
+++ b/modules/meeting/app/services/meetings/dispatch_aggregated_notifications_service.rb
@@ -0,0 +1,196 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meetings
+  # Compute the diff between two meeting journals and sends
+  # the appropriate set of emails.
+  #
+  # For series templates (meeting.template? == true), series schedule updates are
+  # handled by RecurringMeetings::UpdateService directly (it has the full context only then).
+  # This service therefore only dispatches participant-change emails for series templates and one-time meetings
+  class DispatchAggregatedNotificationsService
+    attr_reader :meeting, :since_journal, :latest_journal, :actor, :added_user_ids,
+                :removed_user_ids, :still_invited_ids, :users_by_id, :added_names,
+                :removed_names, :attribute_changes
+
+    def initialize(meeting:, since_journal:, latest_journal:, since_invited_ids: nil, since_attributes: nil)
+      @meeting = meeting
+      @since_journal = since_journal
+      @latest_journal = latest_journal
+      @since_invited_ids_override = since_invited_ids
+      @since_attributes_override = normalize_since_attributes(since_attributes)
+    end
+
+    def call
+      return unless Journal::NotificationConfiguration.active? && meeting.send_emails?
+
+      prepare_changes
+
+      send_direct_notifications
+      send_update_notifications if update_notifications?
+    end
+
+    private
+
+    def prepare_changes # rubocop:disable Metrics/AbcSize
+      @actor = latest_journal.user
+
+      prepare_participant_changes
+      @users_by_id = User.where(id: changed_user_ids).index_by(&:id)
+
+      @added_names = added_user_ids.filter_map { users_by_id[it]&.name }
+      @removed_names = removed_user_ids.filter_map { users_by_id[it]&.name }
+      @attribute_changes = meeting.template? ? {} : compute_attribute_changes
+    end
+
+    def prepare_participant_changes
+      since_invited_ids = @since_invited_ids_override || invited_user_ids_from(since_journal)
+      latest_invited_ids = invited_user_ids_from(latest_journal)
+
+      @added_user_ids = latest_invited_ids - since_invited_ids
+      @removed_user_ids = since_invited_ids - latest_invited_ids
+      @still_invited_ids = latest_invited_ids & since_invited_ids
+    end
+
+    def changed_user_ids
+      (added_user_ids + removed_user_ids + still_invited_ids).uniq
+    end
+
+    def send_direct_notifications
+      added_user_ids.each { |uid| send_invite(users_by_id[uid], actor) }
+      removed_user_ids.each { |uid| send_cancellation(users_by_id[uid], actor) }
+    end
+
+    def send_update_notifications
+      still_invited_ids.filter_map { |uid| users_by_id[uid] }.each do |recipient|
+        send_updated(recipient, actor, attribute_changes, added_names:, removed_names:)
+      end
+    end
+
+    def update_notifications?
+      attribute_changes.any? || added_names.any? || removed_names.any?
+    end
+
+    def invited_user_ids_from(journal)
+      return [] unless journal
+
+      journal.participant_journals.where(invited: true).pluck(:user_id)
+    end
+
+    def compute_attribute_changes
+      latest_data = latest_journal.data
+      return {} unless latest_data
+
+      since_attributes = @since_attributes_override || attributes_from_journal(since_journal)
+      return {} unless since_attributes
+
+      changes = {}
+      %i[title location start_time duration].each do |attr|
+        next unless since_attributes.key?(attr.to_s) && latest_data.respond_to?(attr)
+
+        old_val = since_attributes[attr.to_s]
+        new_val = latest_data.send(attr)
+        changes[attr] = [old_val, new_val] if old_val != new_val
+      end
+      changes
+    end
+
+    def attributes_from_journal(journal)
+      data = journal&.data
+      return unless data
+
+      %w[title location start_time duration].index_with { |attr| data.public_send(attr) }
+    end
+
+    def normalize_since_attributes(attributes)
+      attributes = attributes&.stringify_keys
+      return unless attributes
+
+      attributes["start_time"] = Time.zone.parse(attributes["start_time"]) if attributes["start_time"].is_a?(String)
+      attributes
+    end
+
+    def send_invite(recipient, actor)
+      return unless recipient
+
+      if meeting.template?
+        MeetingSeriesMailer.invited(meeting.recurring_meeting, recipient, actor).deliver_later
+      else
+        MeetingMailer.invited(meeting, recipient, actor).deliver_later
+      end
+    end
+
+    def send_cancellation(recipient, actor)
+      return unless recipient
+
+      if meeting.template?
+        MeetingMailer.cancelled_series(meeting.recurring_meeting, recipient, actor).deliver_later
+      else
+        MeetingMailer.cancelled(meeting, recipient, actor).deliver_later
+      end
+    end
+
+    def send_updated(recipient, actor, attribute_changes, added_names: [], removed_names: [])
+      if meeting.template?
+        send_series_updated(recipient, actor, added_names:, removed_names:)
+      else
+        send_meeting_updated(recipient, actor, attribute_changes, added_names:, removed_names:)
+      end
+    end
+
+    def send_series_updated(recipient, actor, added_names:, removed_names:)
+      series = meeting.recurring_meeting
+      MeetingSeriesMailer.updated(series, recipient, actor,
+                                  changes: { old_schedule: series.full_schedule_in_words,
+                                             old_location: series.location },
+                                  added_participants: added_names,
+                                  removed_participants: removed_names).deliver_later
+    end
+
+    def send_meeting_updated(recipient, actor, attribute_changes, added_names:, removed_names:)
+      MeetingMailer.updated(meeting, recipient, actor,
+                            changes: meeting_changes(attribute_changes),
+                            added_participants: added_names,
+                            removed_participants: removed_names).deliver_later
+    end
+
+    def meeting_changes(attribute_changes) # rubocop:disable Metrics/AbcSize
+      title      = attribute_changes[:title]      || [meeting.title,      meeting.title]
+      start_time = attribute_changes[:start_time] || [meeting.start_time, meeting.start_time]
+      duration   = attribute_changes[:duration]   || [meeting.duration,   meeting.duration]
+      location   = attribute_changes[:location]   || [meeting.location,   meeting.location]
+
+      { old_title: title[0], new_title: title[1],
+        old_start: start_time[0], new_start: start_time[1],
+        old_duration: duration[0], new_duration: duration[1],
+        old_location: location[0], new_location: location[1] }
+    end
+  end
+end
diff --git a/modules/meeting/app/services/recurring_meetings/delete_service.rb b/modules/meeting/app/services/recurring_meetings/delete_service.rb
index 3dad8ed5a56..7f5086ca4af 100644
--- a/modules/meeting/app/services/recurring_meetings/delete_service.rb
+++ b/modules/meeting/app/services/recurring_meetings/delete_service.rb
@@ -37,6 +37,7 @@ module RecurringMeetings
     end
 
     def after_validate(call)
+      Meetings::NotificationDebounceJob.cancel_pending(model.template)
       send_cancellation_mail(model) if model.notify?
 
       call
diff --git a/modules/meeting/app/views/meeting_mailer/participant_added.html.erb b/modules/meeting/app/views/meeting_mailer/participant_added.html.erb
deleted file mode 100644
index 086fc4c2708..00000000000
--- a/modules/meeting/app/views/meeting_mailer/participant_added.html.erb
+++ /dev/null
@@ -1,115 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= render layout: "mailer/spacer_table" do %>
-  <%= render partial: "mailer/mailer_header",
-             locals: {
-               user: @user,
-               summary: I18n.t("meeting.email.participant_added.summary", title: @meeting.title, actor: @actor, participant: @added_participant),
-               bottom_spacing: false
-             } %>
-
-  <%= render layout: "mailer/border_table" do %>
-    <tr>
-      <%= placeholder_cell("24px", vertical: true) %>
-      <td>
-        <table>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= I18n.t(:label_meeting_date_time) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, include_date: false %>
-              -
-              <%= format_time @meeting.end_time, include_date: false %> (<%= formatted_time_zone_offset %>)
-            </td>
-          </tr>
-          <% if @meeting.location.present? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:location) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= auto_link @meeting.location %>
-              </td>
-            </tr>
-          <% end %>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:project) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= link_to @meeting.project.name, project_url(@meeting.project) %>
-            </td>
-          </tr>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:author) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= @meeting.author %>
-            </td>
-          </tr>
-          <% if @meeting.participants.exists? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:participants_invited) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= @meeting.participants.invited.sort.join("; ") %>
-              </td>
-            </tr>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:participants_attended) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= @meeting.participants.attended.sort.join("; ") %>
-              </td>
-            </tr>
-          <% end %>
-        </table>
-      </td>
-    </tr>
-  <% end %>
-
-  <table>
-    <tr>
-      <%= placeholder_cell("20px", vertical: false) %>
-    </tr>
-  </table>
-
-  <%= action_button do %>
-    <%= link_to I18n.t(:"meeting.email.open_meeting_link"),
-                meeting_url(@meeting),
-                target: "_blank",
-                rel: "noopener",
-                style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;" %>
-  <% end %>
-<% end %>
diff --git a/modules/meeting/app/views/meeting_mailer/participant_added.text.erb b/modules/meeting/app/views/meeting_mailer/participant_added.text.erb
deleted file mode 100644
index b8046ed6d90..00000000000
--- a/modules/meeting/app/views/meeting_mailer/participant_added.text.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= I18n.t("meeting.email.participant_added.summary", title: @meeting.title, actor: @actor, participant: @added_participant) %>
-
-<%= @meeting.project.name %>: <%= @meeting.title %> (<%= meeting_url(@meeting) %>)
-
-<%= t :label_meeting_date_time %>: <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, include_date: false %>-<%= format_time @meeting.end_time, include_date: false %> (<%= formatted_time_zone_offset %>)
-<%= Meeting.human_attribute_name(:location) %>: <%= @meeting.location %>
-<%= Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %>
-<%= Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %>
diff --git a/modules/meeting/app/views/meeting_mailer/participant_removed.html.erb b/modules/meeting/app/views/meeting_mailer/participant_removed.html.erb
deleted file mode 100644
index f3373054fb1..00000000000
--- a/modules/meeting/app/views/meeting_mailer/participant_removed.html.erb
+++ /dev/null
@@ -1,115 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= render layout: "mailer/spacer_table" do %>
-  <%= render partial: "mailer/mailer_header",
-             locals: {
-               user: @user,
-               summary: I18n.t("meeting.email.participant_removed.summary", title: @meeting.title, actor: @actor, participant: @removed_participant),
-               bottom_spacing: false
-             } %>
-
-  <%= render layout: "mailer/border_table" do %>
-    <tr>
-      <%= placeholder_cell("24px", vertical: true) %>
-      <td>
-        <table>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= I18n.t(:label_meeting_date_time) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, include_date: false %>
-              -
-              <%= format_time @meeting.end_time, include_date: false %> (<%= formatted_time_zone_offset %>)
-            </td>
-          </tr>
-          <% if @meeting.location.present? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:location) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= auto_link @meeting.location %>
-              </td>
-            </tr>
-          <% end %>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:project) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= link_to @meeting.project.name, project_url(@meeting.project) %>
-            </td>
-          </tr>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:author) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= @meeting.author %>
-            </td>
-          </tr>
-          <% if @meeting.participants.exists? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:participants_invited) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= @meeting.participants.invited.sort.join("; ") %>
-              </td>
-            </tr>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:participants_attended) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= @meeting.participants.attended.sort.join("; ") %>
-              </td>
-            </tr>
-          <% end %>
-        </table>
-      </td>
-    </tr>
-  <% end %>
-
-  <table>
-    <tr>
-      <%= placeholder_cell("20px", vertical: false) %>
-    </tr>
-  </table>
-
-  <%= action_button do %>
-    <%= link_to I18n.t(:"meeting.email.open_meeting_link"),
-                meeting_url(@meeting),
-                target: "_blank",
-                rel: "noopener",
-                style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;" %>
-  <% end %>
-<% end %>
diff --git a/modules/meeting/app/views/meeting_mailer/participant_removed.text.erb b/modules/meeting/app/views/meeting_mailer/participant_removed.text.erb
deleted file mode 100644
index e4a21ee1de5..00000000000
--- a/modules/meeting/app/views/meeting_mailer/participant_removed.text.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= I18n.t("meeting.email.participant_removed.summary", title: @meeting.title, actor: @actor, participant: @removed_participant) %>
-
-<%= @meeting.project.name %>: <%= @meeting.title %> (<%= meeting_url(@meeting) %>)
-
-<%= t :label_meeting_date_time %>: <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, include_date: false %>-<%= format_time @meeting.end_time, include_date: false %> (<%= formatted_time_zone_offset %>)
-<%= Meeting.human_attribute_name(:location) %>: <%= @meeting.location %>
-<%= Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %>
-<%= Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %>
diff --git a/modules/meeting/app/views/meeting_mailer/updated.html.erb b/modules/meeting/app/views/meeting_mailer/updated.html.erb
index e065198ffef..99eca2a3ea9 100644
--- a/modules/meeting/app/views/meeting_mailer/updated.html.erb
+++ b/modules/meeting/app/views/meeting_mailer/updated.html.erb
@@ -146,6 +146,27 @@ See COPYRIGHT and LICENSE files for more details.
             </td>
           </tr>
 
+          <% if @added_participants.any? %>
+            <tr>
+              <td style="<%= placeholder_text_styles(width: "30%") %>">
+                <%= I18n.t("meeting.email.updated.added_participants") %>
+              </td>
+              <td style="<%= placeholder_text_styles(color: "#1f2328", "font-weight": "bold") %>">
+                <%= @added_participants.join(", ") %>
+              </td>
+            </tr>
+          <% end %>
+          <% if @removed_participants.any? %>
+            <tr>
+              <td style="<%= placeholder_text_styles(width: "30%") %>">
+                <%= I18n.t("meeting.email.updated.removed_participants") %>
+              </td>
+              <td style="<%= placeholder_text_styles %>">
+                <s><%= @removed_participants.join(", ") %></s>
+              </td>
+            </tr>
+          <% end %>
+
           <% if @meeting.participants.exists? %>
             <tr>
               <td style="<%= placeholder_text_styles(width: "30%") %>">
diff --git a/modules/meeting/app/views/meeting_mailer/updated.text.erb b/modules/meeting/app/views/meeting_mailer/updated.text.erb
index b524f43362f..a1473f3c040 100644
--- a/modules/meeting/app/views/meeting_mailer/updated.text.erb
+++ b/modules/meeting/app/views/meeting_mailer/updated.text.erb
@@ -69,3 +69,9 @@ See COPYRIGHT and LICENSE files for more details.
 <%= auto_link @changes[:new_location] %>
 <% end %>
 <% end %>
+<% if @added_participants.any? %>
+<%= I18n.t("meeting.email.updated.added_participants") %>: <%= @added_participants.join(", ") %>
+<% end %>
+<% if @removed_participants.any? %>
+<%= I18n.t("meeting.email.updated.removed_participants") %>: <%= @removed_participants.join(", ") %>
+<% end %>
diff --git a/modules/meeting/app/views/meeting_series_mailer/participant_added.html.erb b/modules/meeting/app/views/meeting_series_mailer/participant_added.html.erb
deleted file mode 100644
index 2fd31fb0f03..00000000000
--- a/modules/meeting/app/views/meeting_series_mailer/participant_added.html.erb
+++ /dev/null
@@ -1,105 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= render layout: "mailer/spacer_table" do %>
-  <%= render partial: "mailer/mailer_header",
-             locals: {
-               user: @user,
-               summary: I18n.t("meeting.email.participant_added.summary_series", title: @series.title, actor: @actor, participant: @added_participant),
-               bottom_spacing: false
-             } %>
-
-  <%= render layout: "mailer/border_table" do %>
-    <tr>
-      <%= placeholder_cell("24px", vertical: true) %>
-      <td>
-        <table>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= I18n.t(:label_recurring_meeting_schedule) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>)
-            </td>
-          </tr>
-          <% if @template.location.present? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:location) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= auto_link @template.location %>
-              </td>
-            </tr>
-          <% end %>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:project) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= link_to @series.project.name, project_url(@series.project) %>
-            </td>
-          </tr>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:author) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= @series.author %>
-            </td>
-          </tr>
-          <% if @template.participants.exists? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:participants_invited) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= @template.participants.invited.sort.join("; ") %>
-              </td>
-            </tr>
-          <% end %>
-        </table>
-      </td>
-    </tr>
-  <% end %>
-
-  <table>
-    <tr>
-      <%= placeholder_cell("20px", vertical: false) %>
-    </tr>
-  </table>
-
-  <%= action_button do %>
-    <%= link_to I18n.t(:label_view_meeting_series),
-                recurring_meeting_url(@series),
-                target: "_blank",
-                rel: "noopener",
-                style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;" %>
-  <% end %>
-<% end %>
diff --git a/modules/meeting/app/views/meeting_series_mailer/participant_removed.html.erb b/modules/meeting/app/views/meeting_series_mailer/participant_removed.html.erb
deleted file mode 100644
index 63c4f48d78a..00000000000
--- a/modules/meeting/app/views/meeting_series_mailer/participant_removed.html.erb
+++ /dev/null
@@ -1,105 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= render layout: "mailer/spacer_table" do %>
-  <%= render partial: "mailer/mailer_header",
-             locals: {
-               user: @user,
-               summary: I18n.t("meeting.email.participant_removed.summary_series", title: @series.title, actor: @actor, participant: @removed_participant),
-               bottom_spacing: false
-             } %>
-
-  <%= render layout: "mailer/border_table" do %>
-    <tr>
-      <%= placeholder_cell("24px", vertical: true) %>
-      <td>
-        <table>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= I18n.t(:label_recurring_meeting_schedule) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>)
-            </td>
-          </tr>
-          <% if @template.location.present? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:location) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= auto_link @template.location %>
-              </td>
-            </tr>
-          <% end %>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:project) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= link_to @series.project.name, project_url(@series.project) %>
-            </td>
-          </tr>
-          <tr>
-            <td style="<%= placeholder_text_styles(width: "30%") %>">
-              <%= Meeting.human_attribute_name(:author) %>
-            </td>
-            <td style="<%= placeholder_text_styles %>">
-              <%= @series.author %>
-            </td>
-          </tr>
-          <% if @template.participants.exists? %>
-            <tr>
-              <td style="<%= placeholder_text_styles(width: "30%") %>">
-                <%= Meeting.human_attribute_name(:participants_invited) %>
-              </td>
-              <td style="<%= placeholder_text_styles %>">
-                <%= @template.participants.invited.sort.join("; ") %>
-              </td>
-            </tr>
-          <% end %>
-        </table>
-      </td>
-    </tr>
-  <% end %>
-
-  <table>
-    <tr>
-      <%= placeholder_cell("20px", vertical: false) %>
-    </tr>
-  </table>
-
-  <%= action_button do %>
-    <%= link_to I18n.t(:label_view_meeting_series),
-                recurring_meeting_url(@series),
-                target: "_blank",
-                rel: "noopener",
-                style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;" %>
-  <% end %>
-<% end %>
diff --git a/modules/meeting/app/views/meeting_series_mailer/participant_removed.text.erb b/modules/meeting/app/views/meeting_series_mailer/participant_removed.text.erb
deleted file mode 100644
index 0b24512f322..00000000000
--- a/modules/meeting/app/views/meeting_series_mailer/participant_removed.text.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= I18n.t("meeting.email.participant_removed.summary_series", title: @series.title, actor: @actor, participant: @removed_participant) %>
-
-<%= @series.project.name %>: <%= @series.title %> (<%= recurring_meeting_url(@series) %>)
-
-<%= t :label_recurring_meeting_schedule %>: <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>)
-<%= Meeting.human_attribute_name(:location) %>: <%= @template.location %>
-<%= Meeting.human_attribute_name(:participants_invited) %>: <%= @template.participants.invited.sort.join("; ") %>
diff --git a/modules/meeting/app/views/meeting_series_mailer/updated.html.erb b/modules/meeting/app/views/meeting_series_mailer/updated.html.erb
index 29c2f639d17..dfaac069207 100644
--- a/modules/meeting/app/views/meeting_series_mailer/updated.html.erb
+++ b/modules/meeting/app/views/meeting_series_mailer/updated.html.erb
@@ -119,6 +119,27 @@ See COPYRIGHT and LICENSE files for more details.
               <%= @series.author %>
             </td>
           </tr>
+
+          <% if @added_participants.any? %>
+            <tr>
+              <td style="<%= placeholder_text_styles(width: "30%") %>">
+                <%= I18n.t("meeting.email.updated.added_participants") %>
+              </td>
+              <td style="<%= placeholder_text_styles(color: "#1f2328", "font-weight": "bold") %>">
+                <%= @added_participants.join(", ") %>
+              </td>
+            </tr>
+          <% end %>
+          <% if @removed_participants.any? %>
+            <tr>
+              <td style="<%= placeholder_text_styles(width: "30%") %>">
+                <%= I18n.t("meeting.email.updated.removed_participants") %>
+              </td>
+              <td style="<%= placeholder_text_styles %>">
+                <s><%= @removed_participants.join(", ") %></s>
+              </td>
+            </tr>
+          <% end %>
         </table>
       </td>
     </tr>
diff --git a/modules/meeting/app/views/meeting_series_mailer/updated.text.erb b/modules/meeting/app/views/meeting_series_mailer/updated.text.erb
index d6691b2414a..398c2e91899 100644
--- a/modules/meeting/app/views/meeting_series_mailer/updated.text.erb
+++ b/modules/meeting/app/views/meeting_series_mailer/updated.text.erb
@@ -59,3 +59,9 @@ See COPYRIGHT and LICENSE files for more details.
 <%= auto_link @series.location %>
 <% end %>
 <% end %>
+<% if @added_participants.any? %>
+<%= I18n.t("meeting.email.updated.added_participants") %>: <%= @added_participants.join(", ") %>
+<% end %>
+<% if @removed_participants.any? %>
+<%= I18n.t("meeting.email.updated.removed_participants") %>: <%= @removed_participants.join(", ") %>
+<% end %>
diff --git a/modules/meeting/app/workers/meetings/notification_debounce_job.rb b/modules/meeting/app/workers/meetings/notification_debounce_job.rb
new file mode 100644
index 00000000000..23f16572af7
--- /dev/null
+++ b/modules/meeting/app/workers/meetings/notification_debounce_job.rb
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meetings
+  # Debounces email notifications for meeting changes. Instead of sending emails
+  # immediately for every participant addition/removal or attribute update, this
+  # job waits for 1 minute of inactivity.
+  # It then sends a set of emails based on the net diff between the
+  # journal snapshot at the start of the debounce window and the latest journal.
+  #
+  # Callers use `.debounce(meeting)` to:
+  # 1. Cancels any pending job for this meeting (preserving its since_journal_id)
+  # 2. Schedules a new job with a fresh wait period
+  #
+  # When debounce_minutes == 0 the service is called synchronously (previous behavior).
+  class NotificationDebounceJob < ApplicationJob
+    include GoodJob::ActiveJobExtensions::Concurrency
+
+    queue_with_priority :notification
+
+    good_job_control_concurrency_with(
+      total_limit: 1,
+      key: -> { "Meetings::NotificationDebounceJob-#{arguments.first}" }
+    )
+
+    def self.unique_key_for(meeting_id)
+      "Meetings::NotificationDebounceJob-#{meeting_id}"
+    end
+
+    # Since any changes after the since_journal_id might CHANGE this journal,
+    # we pass in the known values at the current time for the initial call.
+    # They are needed so that we can know the true "previous" values at the end of the debounce window.
+    def self.debounce(meeting, since_journal_id: nil, since_invited_ids: nil, since_attributes: nil)
+      concurrency_key = unique_key_for(meeting.id)
+      existing = GoodJob::Job.where(finished_at: nil, concurrency_key:).first
+      args = preserved_job_args(existing, meeting, since_journal_id, since_invited_ids, since_attributes)
+
+      GoodJob::Job.where(finished_at: nil, concurrency_key:).delete_all
+      set(wait: Meeting.journal_aggregation_time_minutes.minute).perform_later(meeting.id, *args)
+    end
+
+    def perform(meeting_id, since_journal_id, since_invited_ids = nil, since_attributes = nil)
+      meeting = Meeting.find_by(id: meeting_id)
+      return unless meeting&.send_emails?
+
+      since_journal  = Journal.find_by(id: since_journal_id)
+      latest_journal = meeting.last_journal
+      return if latest_journal.nil?
+
+      # Cancel if there are no relevant changes (anymore)
+      return if latest_journal.id == since_journal_id && since_invited_ids.nil? && since_attributes.nil?
+
+      Meetings::DispatchAggregatedNotificationsService
+        .new(meeting:, since_journal:, latest_journal:, since_invited_ids:, since_attributes:)
+        .call
+    end
+
+    def self.cancel_pending(meeting)
+      GoodJob::Job.where(finished_at: nil, concurrency_key: unique_key_for(meeting.id)).delete_all
+    end
+
+    # Extracts arguments from the existing pending job or the journal before we started the debounce
+    # Uses the following order: previous job args > explicit caller arg > journal predecessor.
+    def self.preserved_job_args(existing, meeting, since_journal_id, since_invited_ids, since_attributes)
+      existing_journal_id, existing_invited_ids, existing_attributes = serialized_job_args(existing)
+      [
+        existing_journal_id || since_journal_id || meeting.last_journal&.predecessor&.id,
+        existing_invited_ids || since_invited_ids,
+        existing_attributes || since_attributes
+      ]
+    end
+
+    def self.serialized_job_args(existing)
+      args = ActiveJob::Arguments.deserialize(existing&.serialized_params&.dig("arguments") || [])
+      [args[1], args[2], args[3]]
+    end
+  end
+end
diff --git a/modules/meeting/config/locales/crowdin/af.yml b/modules/meeting/config/locales/crowdin/af.yml
index 86de28693fc..4548155a705 100644
--- a/modules/meeting/config/locales/crowdin/af.yml
+++ b/modules/meeting/config/locales/crowdin/af.yml
@@ -39,6 +39,8 @@ af:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projek
         start_date: Datum
         start_time: Start time
@@ -273,16 +275,6 @@ af:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ af:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ af:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/ar.yml b/modules/meeting/config/locales/crowdin/ar.yml
index 812fc51d9c4..78fac967527 100644
--- a/modules/meeting/config/locales/crowdin/ar.yml
+++ b/modules/meeting/config/locales/crowdin/ar.yml
@@ -43,6 +43,8 @@ ar:
           other: "%{count} Participants"
         participants_attended: الحضور
         participants_invited: المدعوّون
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: مشروع
         start_date: التاريخ
         start_time: Start time
@@ -293,16 +295,6 @@ ar:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -316,6 +308,8 @@ ar:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -458,7 +452,7 @@ ar:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/az.yml b/modules/meeting/config/locales/crowdin/az.yml
index b7614c8296e..4347fb7e361 100644
--- a/modules/meeting/config/locales/crowdin/az.yml
+++ b/modules/meeting/config/locales/crowdin/az.yml
@@ -39,6 +39,8 @@ az:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ az:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ az:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ az:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/be.yml b/modules/meeting/config/locales/crowdin/be.yml
index 24f9788853e..94941ba038d 100644
--- a/modules/meeting/config/locales/crowdin/be.yml
+++ b/modules/meeting/config/locales/crowdin/be.yml
@@ -41,6 +41,8 @@ be:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Дата
         start_time: Start time
@@ -283,16 +285,6 @@ be:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -306,6 +298,8 @@ be:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -448,7 +442,7 @@ be:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/bg.yml b/modules/meeting/config/locales/crowdin/bg.yml
index 2f3982926e5..65de71579d3 100644
--- a/modules/meeting/config/locales/crowdin/bg.yml
+++ b/modules/meeting/config/locales/crowdin/bg.yml
@@ -39,6 +39,8 @@ bg:
           other: "%{count} Участника"
         participants_attended: Присъстващи
         participants_invited: Поканени
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Проект
         start_date: Дата
         start_time: Начален час
@@ -273,16 +275,6 @@ bg:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ bg:
         new_date_time: Нова дата/час
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ bg:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/ca.yml b/modules/meeting/config/locales/crowdin/ca.yml
index 10266dc7942..d2b468b2bd8 100644
--- a/modules/meeting/config/locales/crowdin/ca.yml
+++ b/modules/meeting/config/locales/crowdin/ca.yml
@@ -39,6 +39,8 @@ ca:
           other: "%{count} participants"
         participants_attended: Assistents
         participants_invited: Convidats
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projecte
         start_date: Data
         start_time: Hora d'inici
@@ -273,16 +275,6 @@ ca:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ ca:
         new_date_time: Data/hora nova
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ ca:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/ckb-IR.yml b/modules/meeting/config/locales/crowdin/ckb-IR.yml
index 0b7d4a0819c..ac0206d3413 100644
--- a/modules/meeting/config/locales/crowdin/ckb-IR.yml
+++ b/modules/meeting/config/locales/crowdin/ckb-IR.yml
@@ -39,6 +39,8 @@ ckb-IR:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ ckb-IR:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ ckb-IR:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ ckb-IR:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/cs.yml b/modules/meeting/config/locales/crowdin/cs.yml
index 184bee5553b..6f1e7b0a7c7 100644
--- a/modules/meeting/config/locales/crowdin/cs.yml
+++ b/modules/meeting/config/locales/crowdin/cs.yml
@@ -41,6 +41,8 @@ cs:
           other: "%{count} Účastníků"
         participants_attended: Účastníci
         participants_invited: Pozvaní
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Datum
         start_time: Čas zahájení
@@ -285,16 +287,6 @@ cs:
         summary_series: Série schůzek '%{title}' byla zrušena prostřednictvím %{actor}, nebo jste byli odstraněni jako účastník
         summary: "'%{title}' byla zrušena prostřednictvím %{actor}, nebo jste byli odstraněni jako účastník"
         date_time: Plánované datum/čas
-      participant_added:
-        header: Schůzka '%{title}' - Üčastník přidán
-        header_series: Série schůzek '%{title}' - Üčastník přidán
-        summary: "%{actor} přidal(a) %{participant} do schůzky '%{title}'"
-        summary_series: "%{actor} přidal(a) %{participant} do série schůzek '%{title}'"
-      participant_removed:
-        header: Schůzka '%{title}' - Účastník byl odebrán
-        header_series: Řada schůzek '%{title}' - Uživatel byl odebrán
-        summary: "%{actor} odebral uživatele %{participant} ze schůzky '%{title}'"
-        summary_series: "%{actor} odebral(a) uživatele %{participant} z řady schůzek '%{title}'"
       ended:
         header_series: 'Ukončeno: Série schůzek ''%{title}'''
         summary_series: Série schůzek '%{title}' byla upravena uživatelem %{actor}
@@ -308,6 +300,8 @@ cs:
         new_date_time: Nové datum/čas
         old_location: Stará lokace
         new_location: Nová lokace
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Poslat e-mailovou pozvánku všem účastníkům
     types:
       one_time: Jednorázový
@@ -450,7 +444,7 @@ cs:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Sekce bez názvu
diff --git a/modules/meeting/config/locales/crowdin/da.yml b/modules/meeting/config/locales/crowdin/da.yml
index b6fe3dba869..d8527f4e92b 100644
--- a/modules/meeting/config/locales/crowdin/da.yml
+++ b/modules/meeting/config/locales/crowdin/da.yml
@@ -39,13 +39,15 @@ da:
           other: "%{count} deltagere"
         participants_attended: Tilsluttede
         participants_invited: Inviterede
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Prjoekt
         start_date: Dato
         start_time: Starttidspunkt
         start_time_hour: Starttidspunkt
-        end_time: End time
+        end_time: Slut tid
         template: Template
-        notify: Send notifications
+        notify: Send notifikationer
         sharing: Sharing
       meeting_agenda_item:
         title: Titel
@@ -56,12 +58,12 @@ da:
         item_type: Type
         position: Position
         lock_version: Lock version
-        notes: Notes
+        notes: Noter
       meeting_section:
         title: Titel
         position: Position
       recurring_meeting:
-        title: Title
+        title: Titel
         frequency: Hyppighed
         interval: Interval
         start_date: Starter
@@ -70,10 +72,10 @@ da:
         end_after: Møderækken slutter
         end_date: Slutdato
         iterations: Forekomster
-        time_zone: Time zone
-        location: Location
+        time_zone: Tidszone
+        location: Lokation
         duration: Duration
-        notify: Send notifications
+        notify: Send notfikationer
       recurring_meeting_interim_response:
         start_time: Start time
       meeting_participant:
@@ -111,16 +113,16 @@ da:
     item:
       meeting_agenda_item:
         duration:
-          added: set to %{value}
-          added_html: set to <i>%{value}</i>
-          removed: removed
-          updated: changed from %{old_value} to %{value}
-          updated_html: changed from <i>%{old_value}</i> to <i>%{value}</i>
+          added: sæt til %{value}
+          added_html: sæt til <i>%{value}</i>
+          removed: fjernet
+          updated: ændret fra %{old_value} til %{value}
+          updated_html: ændret fra <i>%{old_value}</i> til <i>%{value}</i>
         position:
           updated: reordered
         work_package:
-          updated: changed from %{old_value} to %{value}
-          updated_html: changed from <i>%{old_value}</i> to <i>%{value}</i>
+          updated: ændret fra %{old_value} til %{value}
+          updated_html: ændret fra <i>%{old_value}</i> til <i>%{value}</i>
   description_attended: tilsluttede
   events:
     meeting: Mødet er ændret
@@ -144,19 +146,19 @@ da:
   label_meeting_new_dynamic: New one-time meeting
   label_meeting_new_recurring: New recurring meeting
   label_meeting_create: Create meeting
-  label_meeting_duplicate: Duplicate meeting
+  label_meeting_duplicate: Dupliker møde
   label_meeting_edit: Rediger møde
   label_meeting_agenda: Dagsorden
   label_meeting_minutes: Referat
   label_meeting_close: Luk
   label_meeting_open: Åbn
   label_meeting_index_delete: Slet
-  label_meeting_open_this_meeting: Open this meeting
+  label_meeting_open_this_meeting: Åben dette møde
   label_meeting_agenda_close: Afslut dagsorden og påbegynd referat
   label_meeting_date_time: Dato/tidspunkt
-  label_meeting_date_and_time: Date and time
+  label_meeting_date_and_time: Dato og tid
   label_meeting_diff: Uenigheder
-  label_meeting_send_updates: Send email calendar invite and updates
+  label_meeting_send_updates: Send email kalender invitation og opdateringer
   label_meeting_send_updates_caption: Send out email invites to all participants of this meeting
   label_recurring_meeting: Recurring meeting
   label_recurring_meeting_part_of: Part of a meeting series
@@ -178,7 +180,7 @@ da:
   label_recurring_meeting_more_past:
     one: There is one more past meeting.
     other: There are %{count} more past meetings.
-  label_recurring_meeting_show_more: Show more
+  label_recurring_meeting_show_more: Vis mere
   label_recurring_meeting_series_create: Create meeting series
   label_recurring_meeting_series_edit: Edit meeting series
   label_recurring_meeting_series_delete: Delete meeting series
@@ -186,9 +188,9 @@ da:
   label_recurring_meeting_series_end_now: End series now
   label_meeting_more:
     one: There is one more meeting.
-    other: There are %{count} more meetings.
-  label_my_meetings: My meetings
-  label_all_meetings: All meetings
+    other: Der er %{count} møder.
+  label_my_meetings: Mine møder
+  label_all_meetings: Alle møder
   label_upcoming_meetings: Upcoming meetings
   label_past_meetings: Past meetings
   label_upcoming_meetings_short: Upcoming
@@ -222,9 +224,9 @@ da:
         attended: Attended
         mark_as_attended: Mark as attended
         mark_all_as_attended: Mark all as attended
-        remove_participant: Remove participant
+        remove_participant: Fjerne deltager
         manage_participants: Manage participants
-        no_participants: No participants
+        no_participants: Ingen deltagere
         show_all: Vis alt
         apply_to_upcoming_meetings: Apply these changes to all upcoming meetings in this series
       text:
@@ -232,8 +234,8 @@ da:
         manage_participants: Search for and add project members as participants to this meeting.
         search_for_members: Search for project members
       blankslate:
-        heading: No participants
-        description: There are no participants yet.
+        heading: Ingen deltagere
+        description: Der er ingen deltagere endnu.
     attachments:
       onetime_template: These attached files will be included in all future meetings using this template.
       series_template: These attached files will be included in all future meetings in the series.
@@ -253,7 +255,7 @@ da:
 
         '
       send_invitation_emails_structured: Send an email invitation immediately to all participants. You can also do this manually at any time later.
-      open_meeting_link: Open meeting
+      open_meeting_link: Åben møde
       open_my_meetings_link: Go to My meetings
       series:
         title: "[%{project_name}] Meeting series '%{title}'"
@@ -273,16 +275,6 @@ da:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ da:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ da:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/de.yml b/modules/meeting/config/locales/crowdin/de.yml
index c4608b292a8..ec5f18863e3 100644
--- a/modules/meeting/config/locales/crowdin/de.yml
+++ b/modules/meeting/config/locales/crowdin/de.yml
@@ -39,6 +39,8 @@ de:
           other: "%{count} Teilnehmer"
         participants_attended: Anwesend
         participants_invited: Eingeladen
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Datum
         start_time: Startzeit
@@ -273,16 +275,6 @@ de:
         summary_series: Terminserie '%{title}' wurde von %{actor} gelöscht, oder Sie wurden als Teilnehmer entfernt
         summary: "'%{title}' wurde von %{actor} abgesagt, oder Sie wurden als Teilnehmer entfernt"
         date_time: Geplanter Zeitpunkt
-      participant_added:
-        header: Besprechung '%{title}' - Teilnehmer hinzugefügt
-        header_series: Terminserie '%{title}' - Teilnehmer hinzugefügt
-        summary: "%{actor} hat %{participant} zur Besprechung '%{title}' hinzugefügt"
-        summary_series: "%{actor} hat %{participant} zur Terminserie '%{title}' hinzugefügt"
-      participant_removed:
-        header: Besprechung '%{title}' - Teilnehmer entfernt
-        header_series: Terminserie '%{title}' - Teilnehmer hinzugefügt
-        summary: "%{actor} hat %{participant} aus Besprechung '%{title}' entfernt"
-        summary_series: "%{actor} hat %{participant} aus Terminserie '%{title}' entfernt"
       ended:
         header_series: 'Beendet: Terminserie ''%{title}'''
         summary_series: Die Terminserie '%{title}' wurde von %{actor} beendet
@@ -296,6 +288,8 @@ de:
         new_date_time: Neue(s) Datum/Zeit
         old_location: Alter Ort
         new_location: Neuer Ort
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: E-Mail Einladung an alle Teilnehmenden versenden
     types:
       one_time: Einmalig
@@ -438,7 +432,7 @@ de:
     widgets:
       blankslate:
         heading: Keine anstehenden Besprechungen
-        description: Anstehende Besprechungen, bei denen Sie der Organisator oder ein Teilnehmer sind, werden hier angezeigt.
+        description: Kommende Besprechungen, an denen Sie teilnehmen, werden hier erscheinen.
       view_details: Alle Besprechungen ansehen
   meeting_section:
     untitled_title: Unbenannter Abschnitt
diff --git a/modules/meeting/config/locales/crowdin/el.yml b/modules/meeting/config/locales/crowdin/el.yml
index 0b4cb1a1c99..7716b5fd048 100644
--- a/modules/meeting/config/locales/crowdin/el.yml
+++ b/modules/meeting/config/locales/crowdin/el.yml
@@ -39,6 +39,8 @@ el:
           other: "%{count} συμμετέχοντες"
         participants_attended: Παρευρισκόμενοι
         participants_invited: Προσκεκλημένοι
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Έργο
         start_date: Ημερομηνία
         start_time: Ώρα έναρξης
@@ -273,16 +275,6 @@ el:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ el:
         new_date_time: Νέα ημερομηνία/ώρα
         old_location: Παλιά τοποθεσία
         new_location: Καινούγια Τοποθεσία
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Αποστολή πρόσκλησης ηλεκτρονικού ταχυδρομείου στους συμμετέχοντες
     types:
       one_time: Μία φορά
@@ -438,7 +432,7 @@ el:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/eo.yml b/modules/meeting/config/locales/crowdin/eo.yml
index 34a37b657fc..c96741d81bd 100644
--- a/modules/meeting/config/locales/crowdin/eo.yml
+++ b/modules/meeting/config/locales/crowdin/eo.yml
@@ -39,6 +39,8 @@ eo:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekto
         start_date: Dato
         start_time: Start time
@@ -273,16 +275,6 @@ eo:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ eo:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ eo:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/es.yml b/modules/meeting/config/locales/crowdin/es.yml
index ede414f7ab1..88832e13166 100644
--- a/modules/meeting/config/locales/crowdin/es.yml
+++ b/modules/meeting/config/locales/crowdin/es.yml
@@ -39,6 +39,8 @@ es:
           other: "%{count} Participantes"
         participants_attended: Asistentes
         participants_invited: Invitados
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Proyecto
         start_date: Fecha
         start_time: Hora de inicio
@@ -273,16 +275,6 @@ es:
         summary_series: "%{actor} ha cancelado la serie de reuniones «%{title}» o se le ha eliminado como participante"
         summary: "%{actor} ha cancelado «%{title}» o se le ha eliminado como participante"
         date_time: Fecha/hora programada
-      participant_added:
-        header: 'Reunión «%{title}»: se añadió un participante'
-        header_series: 'Serie de reuniones «%{title}»: se añadió un participante'
-        summary: "%{actor} ha añadido a %{participant} a la reunión «%{title}»"
-        summary_series: "%{actor} ha añadido a %{participant} a la serie de reuniones «%{title}»"
-      participant_removed:
-        header: 'Reunión «%{title}»: se eliminó un participante'
-        header_series: 'Serie de reuniones «%{title}»: se eliminó un participante'
-        summary: "%{actor} ha eliminado a %{participant} de la reunión «%{title}»"
-        summary_series: "%{actor} ha eliminado a %{participant} de la serie de reuniones «%{title}»"
       ended:
         header_series: 'Terminada: serie de reuniones «%{title}»'
         summary_series: "%{actor} ha terminado la serie de reuniones «%{title}»"
@@ -296,6 +288,8 @@ es:
         new_date_time: Fecha y hora nuevas
         old_location: Ubicación antigua
         new_location: Nueva ubicación
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Enviar invitación por correo electrónico a los participantes
     types:
       one_time: Única
@@ -438,7 +432,7 @@ es:
     widgets:
       blankslate:
         heading: No hay reuniones previstas
-        description: Aquí aparecerán las próximas reuniones en las que usted sea el organizador o uno de los participantes.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: Ver todas las reuniones
   meeting_section:
     untitled_title: Sección sin título
diff --git a/modules/meeting/config/locales/crowdin/et.yml b/modules/meeting/config/locales/crowdin/et.yml
index 5fa5de82cee..2c8da139dbe 100644
--- a/modules/meeting/config/locales/crowdin/et.yml
+++ b/modules/meeting/config/locales/crowdin/et.yml
@@ -39,6 +39,8 @@ et:
           other: "%{count} osalejat"
         participants_attended: Osavõtjad
         participants_invited: Kutsutud
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Kuupäev
         start_time: Algusaeg
@@ -273,16 +275,6 @@ et:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ et:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ et:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/eu.yml b/modules/meeting/config/locales/crowdin/eu.yml
index 10d851168c5..94411bf6972 100644
--- a/modules/meeting/config/locales/crowdin/eu.yml
+++ b/modules/meeting/config/locales/crowdin/eu.yml
@@ -39,6 +39,8 @@ eu:
           other: "%{count} Participants"
         participants_attended: Bertaratuak
         participants_invited: Gonbidatuak
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ eu:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ eu:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ eu:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/fa.yml b/modules/meeting/config/locales/crowdin/fa.yml
index 901f2659337..a8b5e8f17c8 100644
--- a/modules/meeting/config/locales/crowdin/fa.yml
+++ b/modules/meeting/config/locales/crowdin/fa.yml
@@ -39,6 +39,8 @@ fa:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: دعوت کنندگان
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: پروژه
         start_date: تاریخ
         start_time: زمان شروع
@@ -273,16 +275,6 @@ fa:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ fa:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ fa:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/fi.yml b/modules/meeting/config/locales/crowdin/fi.yml
index 071f8b1bb7b..992875c7f77 100644
--- a/modules/meeting/config/locales/crowdin/fi.yml
+++ b/modules/meeting/config/locales/crowdin/fi.yml
@@ -39,6 +39,8 @@ fi:
           other: "%{count} Participants"
         participants_attended: Osallistujat
         participants_invited: Kutsutut
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekti
         start_date: Päivämäärä
         start_time: Start time
@@ -273,16 +275,6 @@ fi:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ fi:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ fi:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/fil.yml b/modules/meeting/config/locales/crowdin/fil.yml
index 9f1f5dcc7a6..270a3f194eb 100644
--- a/modules/meeting/config/locales/crowdin/fil.yml
+++ b/modules/meeting/config/locales/crowdin/fil.yml
@@ -39,6 +39,8 @@ fil:
           other: "%{count} Participants"
         participants_attended: Mga Dadalo
         participants_invited: Mga Imbitado
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Proyekto
         start_date: Petsa
         start_time: Start time
@@ -273,16 +275,6 @@ fil:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ fil:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ fil:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/fr.yml b/modules/meeting/config/locales/crowdin/fr.yml
index bd2db757c81..f0c92b45718 100644
--- a/modules/meeting/config/locales/crowdin/fr.yml
+++ b/modules/meeting/config/locales/crowdin/fr.yml
@@ -39,6 +39,8 @@ fr:
           other: "%{count} participants"
         participants_attended: Présent(s)
         participants_invited: Invités
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projet
         start_date: Date
         start_time: Heure de début
@@ -210,7 +212,7 @@ fr:
   label_time_zone: Fuseau horaire
   label_start_date: Date de début
   label_subscribe_icalendar: S'abonner au calendrier
-  label_recurring_filter: Recurring filter
+  label_recurring_filter: Filtre récurrent
   caption_meeting_template_select: Sélectionnez un modèle pour copier automatiquement ses points de l'ordre du jour
   caption_template_project_select: Veuillez sélectionner le projet dans lequel vous souhaitez créer ce modèle de réunion
   placeholder_meeting_template_select_project_first: Sélectionnez d'abord un projet
@@ -273,16 +275,6 @@ fr:
         summary_series: La série de réunions « %{title} » a été annulée par %{actor}, ou vous avez été supprimé(e) en tant que participant(e)
         summary: "« %{title} » a été annulé par %{actor}, ou vous avez été supprimé(e) en tant que participant(e)"
         date_time: Date/heure prévue
-      participant_added:
-        header: Réunion « %{title} » - Participant ajouté
-        header_series: Série de réunions « %{title} » - Participant ajouté
-        summary: "%{actor} a ajouté %{participant} à la réunion « %{title} »"
-        summary_series: "%{actor} a ajouté %{participant} à la série de réunions « %{title} »"
-      participant_removed:
-        header: Réunion « %{title} » - Participant supprimé
-        header_series: Série de réunions « %{title} » - Participant supprimé
-        summary: "%{actor} a supprimé %{participant} de la réunion « %{title} »"
-        summary_series: "%{actor} a supprimé %{participant} de la série de réunions « %{title} »"
       ended:
         header_series: 'Terminé : Série de rencontres ''%{title}'''
         summary_series: La série de réunions « %{title} » a été clôturée par %{actor}
@@ -296,6 +288,8 @@ fr:
         new_date_time: Nouvelle date/heure
         old_location: Ancien emplacement
         new_location: Nouvel emplacement
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Envoyer une invitation par e-mail aux participants
     types:
       one_time: Ponctuelle
@@ -438,7 +432,7 @@ fr:
     widgets:
       blankslate:
         heading: Aucune réunion à venir
-        description: Les prochaines réunions dont vous êtes l'organisateur ou un participant apparaîtront ici.
+        description: Les prochaines réunions auxquelles vous participerez apparaîtront ici.
       view_details: Voir toutes les réunions
   meeting_section:
     untitled_title: Section sans titre
diff --git a/modules/meeting/config/locales/crowdin/he.yml b/modules/meeting/config/locales/crowdin/he.yml
index e0c79bcb36b..4fb72ab6c8f 100644
--- a/modules/meeting/config/locales/crowdin/he.yml
+++ b/modules/meeting/config/locales/crowdin/he.yml
@@ -41,6 +41,8 @@ he:
           other: "%{count} Participants"
         participants_attended: נוכחים
         participants_invited: מוזמנים
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: פרוייקט
         start_date: תאריך
         start_time: Start time
@@ -283,16 +285,6 @@ he:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -306,6 +298,8 @@ he:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -448,7 +442,7 @@ he:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/hi.yml b/modules/meeting/config/locales/crowdin/hi.yml
index 6cf0292a118..27e182bd05a 100644
--- a/modules/meeting/config/locales/crowdin/hi.yml
+++ b/modules/meeting/config/locales/crowdin/hi.yml
@@ -39,6 +39,8 @@ hi:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: परियोजना
         start_date: तिथि
         start_time: Start time
@@ -273,16 +275,6 @@ hi:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ hi:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ hi:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/hr.yml b/modules/meeting/config/locales/crowdin/hr.yml
index e9af10dbc05..a69c1e6b691 100644
--- a/modules/meeting/config/locales/crowdin/hr.yml
+++ b/modules/meeting/config/locales/crowdin/hr.yml
@@ -40,6 +40,8 @@ hr:
           other: "%{count} Participants"
         participants_attended: Sudionici
         participants_invited: Pozvane osobe
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Datum
         start_time: Start time
@@ -278,16 +280,6 @@ hr:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -301,6 +293,8 @@ hr:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -443,7 +437,7 @@ hr:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/hu.yml b/modules/meeting/config/locales/crowdin/hu.yml
index 1d2824f7eaf..3caee9fc350 100644
--- a/modules/meeting/config/locales/crowdin/hu.yml
+++ b/modules/meeting/config/locales/crowdin/hu.yml
@@ -39,6 +39,8 @@ hu:
           other: "%{count} résztvevő"
         participants_attended: Résztvevők
         participants_invited: Meghívottak
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: dátum
         start_time: Kezdés
@@ -273,16 +275,6 @@ hu:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ hu:
         new_date_time: Új időpont
         old_location: Régi helyszín
         new_location: Új helyszín
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: E-mail meghívó küldése a résztvevőknek
     types:
       one_time: Egyszeri
@@ -438,7 +432,7 @@ hu:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/hy.seeders.yml b/modules/meeting/config/locales/crowdin/hy.seeders.yml
new file mode 100644
index 00000000000..6eac7e135ae
--- /dev/null
+++ b/modules/meeting/config/locales/crowdin/hy.seeders.yml
@@ -0,0 +1,29 @@
+#This file has been generated by script/i18n/generate_seeders_i18n_source_file.
+#Please do not edit directly.
+#This file is part of the sources sent to crowdin for translation.
+---
+hy:
+  seeds:
+    standard:
+      projects:
+        demo-project:
+          meeting_series:
+            item_0:
+              title: Weekly
+          meeting_agenda_items:
+            item_0:
+              title: Good news
+            item_1:
+              title: Updates from development team
+            item_2:
+              title: Updates from product team
+            item_3:
+              title: Updates from marketing team
+            item_5:
+              title: Updates from sales team
+            item_6:
+              title: Review of quarterly goals
+            item_7:
+              title: Core values feedback
+            item_8:
+              title: General topics
diff --git a/modules/meeting/config/locales/crowdin/hy.yml b/modules/meeting/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..2962034e1ee
--- /dev/null
+++ b/modules/meeting/config/locales/crowdin/hy.yml
@@ -0,0 +1,732 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+#English strings go here for Rails i18n
+---
+hy:
+  plugin_openproject_meeting:
+    name: OpenProject Meeting
+    description: This module adds functions to support project meetings to OpenProject. Meetings can be scheduled selecting invitees from the same project to take part in the meeting. An agenda can be created and sent to the invitees. After the meeting, attendees can be selected and minutes can be created based on the agenda. Finally, the minutes can be sent to all attendees and invitees.
+  activerecord:
+    attributes:
+      meeting:
+        type: Meeting type
+        location: Location
+        duration: Duration
+        notes: Notes
+        recurrence_start_time: Scheduled start time
+        participants: Participants
+        participant:
+          one: 1 Participant
+          other: "%{count} Participants"
+        participants_attended: Attendees
+        participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
+        project: Project
+        start_date: Date
+        start_time: Start time
+        start_time_hour: Start time
+        end_time: End time
+        template: Template
+        notify: Send notifications
+        sharing: Sharing
+      meeting_agenda_item:
+        title: Title
+        author: Author
+        duration_in_minutes: Duration
+        description: Notes
+        presenter: Presenter
+        item_type: Type
+        position: Position
+        lock_version: Lock version
+        notes: Notes
+      meeting_section:
+        title: Title
+        position: Position
+      recurring_meeting:
+        title: Title
+        frequency: Frequency
+        interval: Interval
+        start_date: Starts on
+        start_time: Start time
+        start_time_hour: Start time
+        end_after: Meeting series ends
+        end_date: End date
+        iterations: Occurrences
+        time_zone: Time zone
+        location: Location
+        duration: Duration
+        notify: Send notifications
+      recurring_meeting_interim_response:
+        start_time: Start time
+      meeting_participant:
+        invited: Invited
+        attended: Attended
+        participation_status: Participation status
+    errors:
+      models:
+        meeting_participant:
+          user_invalid: is not a valid participant.
+        meeting_agenda_item:
+          section_not_belong_to_meeting: Section does not belong to the same meeting.
+          user_invalid: is not a valid participant.
+        recurring_meeting_interim_response:
+          not_an_occurrence: is not a valid occurrence time for this recurring meeting
+        recurring_meeting:
+          must_cover_existing_meetings:
+            one: There is one open meeting in the series that is not covered by the new schedule. Adjust the schedule to include all existing meetings.
+            other: There are %{count} open meetings in the series that are not covered by the new schedule. Adjust the schedule to include all existing meetings.
+            format: "%{message}"
+      messages:
+        invalid_time_format: 'is not a valid time. Required format: HH:MM'
+    models:
+      recurring_meeting: Recurring meeting
+      meeting: One-time meeting
+      meeting_agenda_item: Agenda item
+      meeting_agenda: Agenda
+      meeting_section: Section
+      token/ical_meeting:
+        one: iCal Meeting subscription
+        other: iCal Meeting subscription
+  activity:
+    filter:
+      meeting: Meetings
+    item:
+      meeting_agenda_item:
+        duration:
+          added: set to %{value}
+          added_html: set to <i>%{value}</i>
+          removed: removed
+          updated: changed from %{old_value} to %{value}
+          updated_html: changed from <i>%{old_value}</i> to <i>%{value}</i>
+        position:
+          updated: reordered
+        work_package:
+          updated: changed from %{old_value} to %{value}
+          updated_html: changed from <i>%{old_value}</i> to <i>%{value}</i>
+  description_attended: attended
+  events:
+    meeting: Meeting edited
+    meeting_agenda: Meeting agenda edited
+    meeting_agenda_closed: Meeting agenda closed
+    meeting_agenda_opened: Meeting agenda opened
+    meeting_minutes: Meeting minutes edited
+    meeting_minutes_created: Meeting minutes created
+  error_notification: Failed to send notification.
+  error_notification_with_errors: 'Failed to send notification. The following recipients could not be notified: %{recipients}'
+  label_meeting: Meeting
+  label_meeting_plural: Meetings
+  label_meeting_templates: Templates
+  label_meeting_template: Template
+  label_meeting_template_new: New template
+  label_meeting_template_create: Create template
+  label_meeting_template_delete: Delete template
+  label_meeting_template_edit: Edit template
+  label_meeting_create_from_template: Create meeting from template
+  label_meeting_new: New Meeting
+  label_meeting_new_dynamic: New one-time meeting
+  label_meeting_new_recurring: New recurring meeting
+  label_meeting_create: Create meeting
+  label_meeting_duplicate: Duplicate meeting
+  label_meeting_edit: Edit Meeting
+  label_meeting_agenda: Agenda
+  label_meeting_minutes: Minutes
+  label_meeting_close: Close
+  label_meeting_open: Open
+  label_meeting_index_delete: Delete
+  label_meeting_open_this_meeting: Open this meeting
+  label_meeting_agenda_close: Close the agenda to begin the Minutes
+  label_meeting_date_time: Date/Time
+  label_meeting_date_and_time: Date and time
+  label_meeting_diff: Diff
+  label_meeting_send_updates: Send email calendar invite and updates
+  label_meeting_send_updates_caption: Send out email invites to all participants of this meeting
+  label_recurring_meeting: Recurring meeting
+  label_recurring_meeting_part_of: Part of a meeting series
+  label_recurring_meeting_new: New recurring meeting
+  label_recurring_meeting_plural: Recurring meetings
+  label_template: Template
+  label_recurring_meeting_view: View meeting series
+  label_recurring_meeting_create: Open
+  label_recurring_meeting_duplicate: Duplicate as a one-time meeting
+  label_recurring_meeting_cancel: Cancel this occurrence
+  label_recurring_meeting_delete: Delete occurrence
+  label_recurring_meeting_restore: Restore this occurrence
+  label_recurring_meeting_schedule: Schedule
+  label_recurring_meeting_next_occurrence: Next occurrence
+  label_recurring_meeting_no_end_date: There are more scheduled meetings (%{schedule}).
+  label_recurring_meeting_more:
+    one: There is one more scheduled meeting (%{schedule}).
+    other: There are %{count} more scheduled meetings (%{schedule}).
+  label_recurring_meeting_more_past:
+    one: There is one more past meeting.
+    other: There are %{count} more past meetings.
+  label_recurring_meeting_show_more: Show more
+  label_recurring_meeting_series_create: Create meeting series
+  label_recurring_meeting_series_edit: Edit meeting series
+  label_recurring_meeting_series_delete: Delete meeting series
+  label_recurring_meeting_series_end: End meeting series
+  label_recurring_meeting_series_end_now: End series now
+  label_meeting_more:
+    one: There is one more meeting.
+    other: There are %{count} more meetings.
+  label_my_meetings: My meetings
+  label_all_meetings: All meetings
+  label_upcoming_meetings: Upcoming meetings
+  label_past_meetings: Past meetings
+  label_upcoming_meetings_short: Upcoming
+  label_past_meetings_short: Past
+  label_involvement: Involvement
+  label_invitations: Invitations
+  label_invited_user: Invited user
+  label_past_invitations: Past invitations
+  label_attended: Attended
+  label_attended_user: Attended user
+  label_created_by_me: Created by me
+  label_notify: Send for review
+  label_icalendar: Send iCalendar
+  label_icalendar_download: Download iCalendar event
+  label_view_meeting: View meeting
+  label_view_meeting_series: View meeting series
+  label_meeting_series: Meeting series
+  label_version: Version
+  label_time_zone: Time zone
+  label_start_date: Start date
+  label_subscribe_icalendar: Subscribe to calendar
+  label_recurring_filter: Recurring filter
+  caption_meeting_template_select: Select a template to automatically copy its agenda items
+  caption_template_project_select: Please select the project in which to create this meeting template
+  placeholder_meeting_template_select_project_first: Select a project first
+  placeholder_meeting_template_no_templates_for_project: No templates available for this project
+  meeting:
+    participants:
+      label:
+        participants: Participants
+        attended: Attended
+        mark_as_attended: Mark as attended
+        mark_all_as_attended: Mark all as attended
+        remove_participant: Remove participant
+        manage_participants: Manage participants
+        no_participants: No participants
+        show_all: Show all
+        apply_to_upcoming_meetings: Apply these changes to all upcoming meetings in this series
+      text:
+        template: These participants will be invited automatically to all future meetings as they are created.
+        manage_participants: Search for and add project members as participants to this meeting.
+        search_for_members: Search for project members
+      blankslate:
+        heading: No participants
+        description: There are no participants yet.
+    attachments:
+      onetime_template: These attached files will be included in all future meetings using this template.
+      series_template: These attached files will be included in all future meetings in the series.
+      text: Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes.
+    copy:
+      title: 'Copy meeting: %{title}'
+      attachments: Copy attachments
+      attachments_text: Copy over all attached files to the new meeting
+      agenda: Copy agenda
+      agenda_items: Copy agenda items
+      agenda_text: Copy the agenda of the old meeting
+      participants: Copy list of participants
+      to_clipboard: Copy link to clipboard
+    email:
+      send_emails: Email participants
+      send_invitation_emails: 'Send an email invitation immediately to the participants selected above. You can also do this manually at any time later.
+
+        '
+      send_invitation_emails_structured: Send an email invitation immediately to all participants. You can also do this manually at any time later.
+      open_meeting_link: Open meeting
+      open_my_meetings_link: Go to My meetings
+      series:
+        title: "[%{project_name}] Meeting series '%{title}'"
+        summary: "%{actor} has invited you to a new meeting series '%{title}'"
+      series_updated:
+        title: "[%{project_name}] Meeting series '%{title}' has been updated"
+        summary: Meeting series '%{title}' has been updated by %{actor}
+        old_schedule: Old schedule
+        new_schedule: New schedule
+      invited:
+        summary: "%{actor} has sent you an invitation for the meeting '%{title}'"
+      cancelled:
+        header: 'Cancelled: Meeting ''%{title}'''
+        header_occurrence: 'Cancelled: Meeting occurrence ''%{title}'''
+        header_series: 'Cancelled: Meeting series ''%{title}'''
+        summary_occurrence: An occurrence of '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
+        summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
+        summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
+        date_time: Scheduled date/time
+      ended:
+        header_series: 'Ended: Meeting series ''%{title}'''
+        summary_series: Meeting series '%{title}' has been ended by %{actor}
+      updated:
+        header: Meeting '%{title}' has been updated
+        summary: Meeting '%{title}' has been updated by %{actor}
+        body: The meeting '%{title}' has been updated by %{actor}.
+        old_title: Old title
+        new_title: New title
+        old_date_time: Old date/time
+        new_date_time: New date/time
+        old_location: Old location
+        new_location: New location
+        added_participants: Added
+        removed_participants: Removed
+    label_mail_all_participants: Send email invite to participants
+    types:
+      one_time: One-time
+      recurring: Recurring
+      recurring_text: Create meeting series with dynamic template for each occurrence.
+      structured_text: Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package.
+      structured_text_copy: Copying a meeting will currently not copy the associated meeting agenda items, just the details
+    copied: 'Copied from Meeting #%{id}'
+    delete_dialog:
+      one_time:
+        title: Delete meeting
+        heading: Delete this meeting?
+        confirmation_message_html: 'This action is not reversible. Please proceed with caution.
+
+          '
+        template:
+          title: Delete template
+          heading: Delete this template?
+          confirmation_message_html: 'This action is not reversible. Please proceed with caution. Existing meetings that were created using this template will not be affected.
+
+            '
+      occurrence:
+        title: Cancel meeting occurrence
+        heading: Cancel this meeting occurrence?
+        confirmation_message_html: 'Any meeting information not in the template will be lost. Do you want to continue?
+
+          '
+        confirm_button: Cancel occurrence
+    blankslate:
+      title: There are no meetings to display
+      desc: You can create a new meeting or change filter criteria
+    label_export_pdf: Export PDF
+    export:
+      your_meeting_export: Meeting is being exported
+      minutes:
+        footer_page_numbers: P. %{current_page} of %{total_pages}
+        author: Author
+        date: Date
+        time: Time
+        location: Location
+        title: Minutes
+    export_pdf_dialog:
+      title: Export PDF
+      description: Generate a printable PDF file of this meeting at the current state.
+      templates:
+        default:
+          label: Default
+          caption: The default template is suitable for most meetings and represent the current state.
+        minutes:
+          label: Minutes
+          caption: The minutes template is suitable for closed and archived meetings.
+      first_page_header_left:
+        label: First page header left
+        caption: This text will appear on the first page at the left of the header.
+      author:
+        label: Author
+        caption: The author of the minutes will be displayed in the subtitle.
+      include_participants:
+        label: Include list of participants
+        caption: A list of participants will be preset above the meeting agenda.
+      include_attachments:
+        label: Include list of attachments
+        caption: A list containing the filenames of attachments will be appended at the end.
+      include_backlog:
+        label: Include backlog
+        caption: Backlog elements are not normally considered part of a meeting occurrence but you can choose to include them.
+      include_outcomes:
+        label: Include agenda outcomes
+        caption: If your agenda outcomes contain confidential information, you can choose to not include them in the export.
+      footer_text:
+        label: Footer text
+        caption: This text will appear on every page at the center of the footer.
+      submit_button: Download
+    notifications:
+      sidepanel:
+        title: Email calendar updates
+        description:
+          disabled: Participants will not receive an email informing them of changes.
+          enabled: All participants will receive updated calendar invites via email informing them of changes.
+          change_via_template: To change this, edit the series template.
+      dialog:
+        title:
+          enable: Enable email calendar updates?
+          disable: Disable email calendar updates?
+        message:
+          enable: 'All participants will receive updated calendar invites via email every time there is a change to the meeting date, time, location or participants. Once enabled, an email will be sent out immediately to all participants.
+
+            '
+          disable: 'Participants will no longer receive updated calendar invites via email when there are changes to the meeting date, time, location or participants. If they already had an invite for this meeting, it might no longer be accurate.
+
+            '
+        confirm_label:
+          enable: Enable email updates
+          disable: Disable email updates
+      banner:
+        participants:
+          enabled: 'All participants will receive updated calendar invites via email when you add or remove participants.
+
+            '
+          disabled: 'Email calendar updates are disabled. Participants will not receive an email informing them when you add or remove participants.
+
+            '
+          draft_disabled: 'Participants will not receive an email informing them when you add or remove participants.
+
+            '
+        onetime:
+          enabled: 'All participants will receive updated calendar invites via email when you add or remove participants.
+
+            '
+          disabled: 'Participants will not receive an email informing them of changes to meeting date, time or participants.
+
+            '
+        occurrence:
+          enabled: 'Email calendar updates are enabled for the meeting series. All participants will receive updated calendar invites informing them of your changes to this occurrence.
+
+            '
+          disabled: 'Email calendar updates are disabled for the meeting series. Participants will not receive an email informing them of your changes to this occurrence.
+
+            '
+        template:
+          enabled: 'Email calendar updates are enabled for the meeting series. All participants will receive updated calendar invites informing them of your changes to this template or to individual occurrences.
+
+            '
+          disabled: 'Email calendar updates are disabled for the meeting series. Participants will not receive an email informing them of your changes to this template or to individual occurrences.
+
+            '
+    presentation_mode:
+      title: Presentation Mode
+      button_present: Present
+      exit: Exit presentation
+      current_item: Current item
+      total_items: "%{current} of %{total}"
+      previous: Previous
+      next: Next
+      no_items: No agenda items
+      no_items_flash: There are no agenda items to present.
+    ical_response:
+      update_failed: Could not update participation status.
+      meeting_not_found: Meeting not found for the given UID.
+    widgets:
+      blankslate:
+        heading: No upcoming meetings
+        description: Upcoming meetings you are participating in will appear here.
+      view_details: View all meetings
+  meeting_section:
+    untitled_title: Untitled section
+    delete_confirmation: Deleting the section will also delete all of its agenda items. Are you sure you want to do this?
+    placeholder_title: New section
+    empty_text: Drag items here or create a new one
+  meeting_participant:
+    participation_status:
+      needs_action: No response
+      accepted: Accepted
+      declined: Declined
+      tentative: Maybe
+      unknown: Unknown
+  recurring_meeting:
+    time_zone_difference_banner:
+      title: Time zone difference
+      description: 'The dates below are referencing the time zone of the meeting series (%{actual_zone}), not your local time zone (%{user_zone}).
+
+        '
+    ended_blankslate:
+      title: Meeting series ended
+      message: 'This meeting series has come to an end. There are no upcoming meetings. '
+      action: You can still view past occurrences or edit the meeting series to extend it.
+    occurrence:
+      infoline: This meeting is part of a recurring meeting series.
+      error_no_next: There is no next occurrence for this meeting.
+      first_already_exists: The first occurrence of this meeting series is already instantiated.
+      first_created: 'The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+
+        '
+    template:
+      button_finalize: Open first meeting
+      blank_title: Your meeting series template is empty
+      description: 'This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+
+        '
+      label_view_template: View template
+      label_edit_template: Edit template
+      banner_html: 'You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already-created meetings.
+
+        '
+      draft_banner_html: 'You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already-created meetings. No email invites will be sent in this current draft mode until you open the first meeting.
+
+        '
+    frequency:
+      x_daily:
+        one: Every day
+        other: Every %{count} days
+      x_weekly:
+        one: Every week
+        other: Every %{count} weeks
+      every_weekday: Every %{day_of_the_week}
+      working_days: Every working day
+    end_after:
+      never: never
+      specific_date: after a specific date
+      iterations: after a number of occurrences
+    starts: Starts
+    in_words:
+      daily_interval: Every %{interval} days
+      working_days: Every working day
+      weekly: Every week on %{weekday}
+      weekly_interval: Every %{interval} weeks on %{weekday}
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
+      full_past: "%{base} at %{time}, ended on %{end_date}"
+      never_ending: "%{base} at %{time}"
+    open:
+      title: Agenda opened
+      subtitle: 'Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences.
+
+        '
+      blankslate:
+        title: No open meetings at the moment
+        desc: You can manually open a planned meeting by clicking on the 'Open' button below
+    planned:
+      title: Planned
+      subtitle: 'The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda.
+
+        '
+      blankslate:
+        title: No more planned meetings
+        desc: 'There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval.
+
+          '
+    delete_dialog:
+      title: Delete meeting series
+      heading: Permanently delete this meeting series?
+      confirmation_message_html:
+        zero: 'The meeting series <strong>%{title}</strong> does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution.
+
+          '
+        one: 'Deleting <strong>%{title}</strong> will also delete one occurrence in this series. This action is not reversible. Please proceed with caution.
+
+          '
+        other: 'Deleting <strong>%{title}</strong> will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution.
+
+          '
+    scheduled_delete_dialog:
+      title: Cancel meeting occurrence
+      heading: Cancel this meeting occurrence?
+      confirmation_message_html: 'Any meeting information not in the template will be lost. Do you want to continue?
+
+        '
+      confirm_button: Cancel occurrence
+    end_series_dialog:
+      title: End meeting series
+  notice_successful_notification: Email calendar update sent to all participants
+  notice_meeting_template_created: Template successfully created
+  notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
+  notice_meeting_updated: This page has been updated by someone else. Reload to view changes.
+  permission_create_meetings: Create meetings
+  permission_edit_meetings: Edit meetings
+  permission_delete_meetings: Delete meetings
+  permission_view_meetings: View meetings
+  permission_manage_agendas: Manage agendas
+  permission_manage_agendas_explanation: Allows creating, editing and removing agenda items
+  permission_manage_outcomes: Manage outcomes
+  permission_send_meeting_invites_and_outcomes: Send meeting invites and outcomes to participants
+  project_module_meetings: Meetings
+  text_duration_in_hours: Duration in hours
+  text_in_hours: in hours
+  text_meeting_agenda_for_meeting: agenda for the meeting "%{meeting}"
+  text_meeting_template_blank_slate_heading: There are no templates to display
+  text_meeting_template_blank_slate: You can create a new template for one-time meetings
+  text_meeting_series_end_early_heading: Delete future occurrences?
+  text_meeting_series_end_early: Ending the series will delete any future open or scheduled meeting occurrences
+  text_meeting_closing_are_you_sure: Are you sure you want to close the meeting agenda?
+  text_meeting_agenda_open_are_you_sure: This will overwrite all changes in the minutes! Do you want to continue?
+  text_meeting_minutes_for_meeting: minutes for the meeting "%{meeting}"
+  text_notificiation_invited: 'This mail contains an ics entry for the meeting below:'
+  text_meeting_ics_description: 'Link to meeting: %{url}'
+  text_meeting_ics_meeting_series_description: 'Link to meeting series: %{url}'
+  text_meeting_occurrence_ics_description: 'Link to meeting occurrence: %{url} Link to meeting series: %{series_url}'
+  text_meeting_empty_heading: Your meeting is empty
+  text_meeting_empty_description1: Start by adding agenda items below. Each item can be as simple as just a title, but you can also add additional details like duration and notes.
+  text_meeting_empty_description2: You can also add references to existing work packages. When you do, related notes will automatically be visible in the work package's "Meetings" tab.
+  label_meeting_empty_action: Add agenda item
+  label_meeting_actions: Meeting actions
+  label_meeting_edit_title: Edit meeting title
+  label_meeting_delete: Delete meeting
+  label_meeting_created_by: Created by
+  label_meeting_last_updated: Last updated
+  label_meeting_reload: Reload
+  label_meeting_index_today: Today
+  label_meeting_index_tomorrow: Tomorrow
+  label_meeting_index_this_week: Later this week
+  label_meeting_index_later: Next week and later
+  label_agenda_items: Agenda items
+  label_agenda_items_reordered: reordered
+  label_agenda_item_add: Add agenda item
+  label_agenda_item_remove_from_agenda: Remove from agenda
+  label_agenda_item_remove_from_backlog: Remove from backlog
+  label_agenda_item_undisclosed_wp: 'Work package #%{id} not visible'
+  label_agenda_item_deleted_wp: Deleted work package reference
+  label_agenda_item_actions: Agenda items actions
+  label_agenda_item_move_to_next_title: Move to next meeting?
+  label_agenda_item_move: Move
+  label_agenda_item_move_to_next: Move to next meeting
+  label_agenda_item_move_to_backlog: Move to backlog
+  label_agenda_item_move_to_current_meeting: Move to current meeting
+  label_agenda_item_move_to_section: Move to section
+  label_agenda_item_move_to_top: Move to top
+  label_agenda_item_move_to_bottom: Move to bottom
+  label_agenda_item_move_up: Move up
+  label_agenda_item_move_down: Move down
+  label_agenda_item_duplicate: Duplicate
+  label_agenda_item_duplicate_in_next: Duplicate in next meeting
+  label_agenda_item_duplicate_in_next_title: Duplicate in next meeting?
+  label_agenda_item_add_notes: Add notes
+  label_agenda_item_add_outcome: Add outcome
+  label_agenda_item_work_package_add: Add work package
+  label_agenda_item_work_package: Agenda item work package
+  label_section_rename: Rename section
+  label_agenda_outcome: Outcome
+  label_agenda_new_outcome: New outcome
+  label_agenda_outcome_actions: Agenda outcome actions
+  label_agenda_outcome_edit: Edit outcome
+  label_agenda_outcome_delete: Remove outcome
+  label_added_as_outcome: Added as outcome
+  label_write_outcome: Write outcome
+  label_existing_work_package: Existing work package
+  text_outcome_not_editable_anymore: This outcome is not editable anymore.
+  text_outcome_cannot_be_added: An outcome can no longer be added.
+  label_backlog_clear: Clear backlog
+  label_backlog_clear_button: Clear all
+  text_backlog_clear_error: One or more errors occurred while trying to clear the backlog.
+  label_agenda_backlog: Agenda backlog
+  text_agenda_backlog: 'This backlog is unique to this one-time meeting. You can drag items in and out to add or remove them from the meeting agenda.
+
+    '
+  label_agenda_backlog_clear_title: Clear agenda backlog?
+  text_agenda_backlog_clear_description: 'Are you sure you want to remove all items currently in the agenda backlog? This action is not reversible.
+
+    '
+  label_series_backlog: Series backlog
+  text_series_backlog: 'The backlog is shared with all occurrences of this series. You can drag items in and out to add or remove them from a particular meeting.
+
+    '
+  label_series_backlog_clear_title: Clear series backlog?
+  text_series_backlog_clear_description: 'This will remove all items in the series backlog, which is shared with all meetings in the series. Are you sure you want to continue? This action is not reversible.
+
+    '
+  text_agenda_item_title: Agenda item "%{title}"
+  text_agenda_work_package_deleted: Agenda item for deleted work package
+  text_deleted_agenda_item: Deleted agenda item
+  label_initial_meeting_details: Meeting
+  label_meeting_details: Meeting details
+  label_meeting_series_details: Meeting series details
+  label_meeting_details_edit: Edit meeting details
+  label_meeting_state: Meeting status
+  label_meeting_state_draft: Draft
+  label_meeting_state_open: Open
+  label_meeting_state_closed: Closed
+  label_meeting_state_agenda_created: Agenda created
+  label_meeting_state_planned: Planned
+  label_meeting_state_cancelled: Cancelled
+  label_meeting_state_skipped: Skipped
+  label_meeting_state_in_progress: In progress
+  label_meeting_reopen_action: Reopen meeting
+  label_meeting_close_action: Close meeting
+  label_meeting_in_progress_action: Start meeting
+  label_meeting_open_action: Open meeting
+  text_meeting_draft_description: Prepare your agenda in draft mode. This meeting will not send out any calendar updates or invites, even if you change meeting details or add/remove participants.
+  text_meeting_open_description: You can add/remove agenda items and participants. Once the agenda is ready, mark it as in progress to document outcomes.
+  text_meeting_closed_description: This meeting is closed. You cannot add/remove agenda items anymore.
+  text_meeting_in_progress_description: You can modify the agenda, document outcomes for each item and track attendance for participants. Once the meeting is complete, you can mark it as closed to lock it.
+  text_meeting_open_dropdown_description: Any existing outcomes will remain but users will not be able to add new outcomes.
+  text_meeting_in_progress_dropdown_description: Document outcomes like information needs or decisions taken during the meeting.
+  text_meeting_closed_dropdown_description: This meeting is closed. You cannot modify agenda items or outcomes anymore.
+  text_meeting_draft_banner: You are currently in draft mode. This meeting will not send out any calendar updates or invites, even if you change meeting details or add/remove participants.
+  text_onetime_meeting_template_banner: You are currently editing a meeting template. You can use this template to create one-time meetings with a predefined agenda. Changes will not affect already-created meetings.
+  text_onetime_meeting_template_empty_heading: This meeting template is empty
+  text_onetime_meeting_template_empty_description: Add agenda items, sections and attachments here. They will be included in every meeting created using this template.
+  text_exit_draft_mode_dialog_title: Open this meeting and send invites?
+  text_exit_draft_mode_dialog_subtitle: You cannot return to draft mode once you schedule a meeting.
+  text_exit_draft_mode_dialog_template_title: Open the first occurrence of this meeting series?
+  text_exit_draft_mode_dialog_template_subtitle: You cannot return to draft mode after this.
+  label_meeting_template_sharing: Sharing
+  label_meeting_template_sharing_none: Only with this project
+  label_meeting_template_sharing_descendants: With subprojects
+  label_meeting_template_sharing_system: With all projects
+  text_meeting_template_sharing_description: This template can be shared with subprojects or other projects in this instance. Only the agenda items and attachments will be copied.
+  text_meeting_not_editable_anymore: This meeting is not editable anymore.
+  text_meeting_not_present_anymore: This meeting was deleted. Please select another meeting.
+  label_add_work_package_to_meeting_dialog_title: Select meeting
+  label_add_work_package_to_meeting_section_label: Section
+  label_add_work_package_to_meeting_dialog_button: Add to meeting
+  label_meeting_selection_caption: It is only possible to add this work package to an upcoming or an ongoing meeting.
+  label_section_selection_caption: Choose a particular section of the agenda or add it to the backlog.
+  placeholder_section_select_meeting_first: Meeting selection is required first
+  text_add_work_package_to_meeting_form: The work package will be added to the selected meeting or backlog as an agenda item.
+  text_add_work_package_to_meeting_description: A work package can be added to one or multiple meetings for discussion. Any notes concerning it are also visible here.
+  text_agenda_item_no_notes: No notes provided
+  text_agenda_item_not_editable_anymore: This agenda item is not editable anymore.
+  text_agenda_item_move_next_meeting: This item will be moved to the next meeting on %{date} at %{time}.
+  text_agenda_item_moved_to_next_meeting: Agenda item moved to the next meeting, on %{date}
+  text_agenda_item_duplicate_in_next_meeting: Are you sure you want to add a copy of this agenda item to the next meeting, on %{date} at %{time}? Outcomes will not be duplicated.
+  text_agenda_item_duplicated_in_next_meeting: Agenda item duplicated in the next meeting, on %{date}
+  text_work_package_has_no_upcoming_meeting_agenda_items: This work package is not scheduled in an upcoming meeting agenda yet.
+  text_agenda_item_no_available_occurrence: No upcoming occurrences are available.
+  text_agenda_item_dialog_skipping_note: 'Note: Skipping %{details}.'
+  text_agenda_item_dialog_skipping_cancelled_one: cancelled meeting on %{date}
+  text_agenda_item_dialog_skipping_cancelled_many: "%{count} cancelled meetings"
+  text_agenda_item_dialog_skipping_closed_one: closed meeting on %{date}
+  text_agenda_item_dialog_skipping_closed_many: "%{count} closed meetings"
+  text_work_package_add_to_meeting_hint: Use the "Add to meeting" button to add this work package to an upcoming meeting.
+  text_work_package_has_no_past_meeting_agenda_items: This work package was not added as an agenda item in a past meeting.
+  text_email_updates_muted: Email calendar updates are muted. Participants will not receive updated invites via email when you make changes.
+  text_email_updates_enabled: Email calendar updates are enabled. All participants will receive updated invites via email when you make changes.
+  my_account:
+    access_tokens:
+      token/ical_meeting:
+        blank_description: You can create one using the button below.
+        blank_title: No iCalendar meeting token
+        title: iCalendar for meetings
+        table_title: iCalendar meeting tokens
+        text_hint: iCalendar meeting tokens allow users to subscribe to all their meetings and view up-to-date meeting information in external clients.
+        disabled_text: iCalendar meeting subscriptions are not enabled by the administrator. Please contact your administrator to use this feature.
+        add_button: Subscribe to calendar
+  my:
+    access_token:
+      dialog:
+        token/ical_meeting:
+          dialog_title: New iCal subscription token for meetings
+          dialog_body: This token will generate an iCal subscription URL that lets you view all your meetings in an external calendar application.
+          create_button: Create subscription
+          name_label: Token name
+          name_caption: You can name it after where you will use it, such as "My phone" or "Work computer".
+      created_dialog:
+        token/ical_meeting:
+          title: An iCal meeting subscription token has been generated
+          body: Treat the following URL as you would a password. Anyone who has access to it can view all your meetings.
+      revocation:
+        token/ical_meeting:
+          notice_success: The iCalendar meeting subscription has been revoked successfully.
+          notice_failure: 'Failed to revoke iCalendar meeting subscription: %{error}'
diff --git a/modules/meeting/config/locales/crowdin/id.yml b/modules/meeting/config/locales/crowdin/id.yml
index bf34ee77c8f..b5dcf8dd89d 100644
--- a/modules/meeting/config/locales/crowdin/id.yml
+++ b/modules/meeting/config/locales/crowdin/id.yml
@@ -38,6 +38,8 @@ id:
           other: "%{count} Peserta"
         participants_attended: Peserta
         participants_invited: Undangan
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Tanggal
         start_time: Waktu mulai
@@ -268,16 +270,6 @@ id:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Tanggal/waktu yang dijadwalkan
-      participant_added:
-        header: Rapat '%{title}' - Peserta telah ditambahkan
-        header_series: Seri rapat '%{title}' - Peserta telah ditambahkan
-        summary: "%{actor} menambahkan %{participant} ke rapat '%{title}'"
-        summary_series: "%{actor} menambahkan %{participant} ke seri rapat '%{title}'"
-      participant_removed:
-        header: Rapat '%{title}' - Peserta telah dihapus
-        header_series: Seri rapat '%{title}' - Peserta telah dihapus
-        summary: "%{actor} menghapus %{participant} ke rapat '%{title}'"
-        summary_series: "%{actor} menghapus %{participant} ke seri rapat '%{title}'"
       ended:
         header_series: 'Selesai: Seri rapat ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -291,6 +283,8 @@ id:
         new_date_time: Tanggal/waktu baru
         old_location: Lokasi sebelumnya
         new_location: Lokasi baru
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Kirim undangan melalui email kepada peserta
     types:
       one_time: Satu kali
@@ -433,7 +427,7 @@ id:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/it.yml b/modules/meeting/config/locales/crowdin/it.yml
index d9f60246d0b..62005d5661a 100644
--- a/modules/meeting/config/locales/crowdin/it.yml
+++ b/modules/meeting/config/locales/crowdin/it.yml
@@ -39,6 +39,8 @@ it:
           other: "%{count} partecipanti"
         participants_attended: Invitati
         participants_invited: Invitati
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Progetto
         start_date: Data
         start_time: Ora di inizio
@@ -273,16 +275,6 @@ it:
         summary_series: La serie di riunioni '%{title}' è stata annullata da %{actor} oppure ti hanno rimosso come partecipante
         summary: "'%{title}' è stata annullata da %{actor} oppure ti hanno rimosso come partecipante"
         date_time: Data/ora programmata
-      participant_added:
-        header: Riunione '%{title}' - Partecipante aggiunto
-        header_series: Serie di riunioni '%{title}' - Partecipante aggiunto
-        summary: "%{actor} ha aggiunto %{participant} alla riunione '%{title}'"
-        summary_series: "%{actor} ha aggiunto %{participant} alla serie di riunioni '%{title}'"
-      participant_removed:
-        header: Riunione '%{title}' - Partecipante rimosso
-        header_series: Serie di riunioni '%{title}' - Partecipante rimosso
-        summary: "%{actor} ha rimosso %{participant} dalla riunione '%{title}'"
-        summary_series: "%{actor} ha rimosso %{participant} dalla serie di riunioni '%{title}'"
       ended:
         header_series: 'Terminata: serie di riunioni "%{title}"'
         summary_series: La serie di riunioni '%{title}' è stata conclusa da %{actor}
@@ -296,6 +288,8 @@ it:
         new_date_time: Nuova data/ora
         old_location: Posizione precedente
         new_location: Nuova posizione
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Invia invito tramite e-mail a tutti i partecipanti
     types:
       one_time: Una tantum
@@ -438,7 +432,7 @@ it:
     widgets:
       blankslate:
         heading: Nessuna riunione imminente
-        description: Le prossime riunioni di cui sei organizzatore o partecipante appariranno qui.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: Visualizza tutte le riunioni
   meeting_section:
     untitled_title: Sezione senza titolo
diff --git a/modules/meeting/config/locales/crowdin/ja.yml b/modules/meeting/config/locales/crowdin/ja.yml
index 67c96eac31f..bfb511ce35c 100644
--- a/modules/meeting/config/locales/crowdin/ja.yml
+++ b/modules/meeting/config/locales/crowdin/ja.yml
@@ -38,6 +38,8 @@ ja:
           other: 参加者　%{count}
         participants_attended: 出席者
         participants_invited: 招待
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: プロジェクト
         start_date: 日付
         start_time: 開始時間
@@ -268,16 +270,6 @@ ja:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: スケジュールされた日時
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -291,6 +283,8 @@ ja:
         new_date_time: 新しい日付/時刻
         old_location: 古い場所
         new_location: 新しい場所
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: 招待メールを参加者に送信
     types:
       one_time: 会議
@@ -433,7 +427,7 @@ ja:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: タイトルなしセクション
diff --git a/modules/meeting/config/locales/crowdin/js-hy.yml b/modules/meeting/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..787d25ee344
--- /dev/null
+++ b/modules/meeting/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,28 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    label_meetings: Meetings
+    work_packages:
+      tabs:
+        meetings: Meetings
diff --git a/modules/meeting/config/locales/crowdin/ka.yml b/modules/meeting/config/locales/crowdin/ka.yml
index 5a4776ac047..94a794cffd7 100644
--- a/modules/meeting/config/locales/crowdin/ka.yml
+++ b/modules/meeting/config/locales/crowdin/ka.yml
@@ -39,6 +39,8 @@ ka:
           other: "%{count} მონაწილე"
         participants_attended: დამსწრეები
         participants_invited: მოწვეულები
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: პროექტი
         start_date: თარიღი
         start_time: Start time
@@ -273,16 +275,6 @@ ka:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ ka:
         new_date_time: ახალი თარიღი/დრო
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ ka:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/kk.yml b/modules/meeting/config/locales/crowdin/kk.yml
index ac0a75a0607..5ad2c364aec 100644
--- a/modules/meeting/config/locales/crowdin/kk.yml
+++ b/modules/meeting/config/locales/crowdin/kk.yml
@@ -39,6 +39,8 @@ kk:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ kk:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ kk:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ kk:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/ko.yml b/modules/meeting/config/locales/crowdin/ko.yml
index 681f2262a98..aff2fa59b13 100644
--- a/modules/meeting/config/locales/crowdin/ko.yml
+++ b/modules/meeting/config/locales/crowdin/ko.yml
@@ -38,6 +38,8 @@ ko:
           other: 참가자 %{count}명
         participants_attended: 참석자
         participants_invited: 초대된 사람
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: 프로젝트
         start_date: 날짜
         start_time: 시작 시간
@@ -268,16 +270,6 @@ ko:
         summary_series: "'%{title}' 미팅 시리즈가 %{actor} 님에 의해 취소되었거나, 참가자에서 회원님이 제거되었습니다"
         summary: "'%{title}'이(가) %{actor} 님에 의해 취소되었거나, 참가자에서 회원님이 제거되었습니다"
         date_time: 스케줄링된 날짜/시간
-      participant_added:
-        header: 미팅 '%{title}' - 참가자 추가됨
-        header_series: 미팅 시리즈 '%{title}' - 참가자 추가됨
-        summary: "%{actor} 님이 미팅 '%{title}'에 %{participant} 님을 추가했습니다"
-        summary_series: "%{actor} 님이 미팅 시리즈 '%{title}'에 %{participant} 님을 추가했습니다"
-      participant_removed:
-        header: 미팅 '%{title}' - 참가자 제거됨
-        header_series: 미팅 시리즈 '%{title}' - 참가자 제거됨
-        summary: "%{actor} 님이 미팅 '%{title}'에서 %{participant} 님을 제거했습니다"
-        summary_series: "%{actor} 님이 미팅 시리즈 '%{title}'에서 %{participant} 님을 제거했습니다"
       ended:
         header_series: '종료됨: 미팅 시리즈 ''%{title}'''
         summary_series: "'%{title}' 미팅 시리즈를 %{actor} 님이 종료했습니다"
@@ -291,6 +283,8 @@ ko:
         new_date_time: 새로운 날짜/시간
         old_location: 이전 위치
         new_location: 새로운 위치
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: 참가자에게 이메일 초대장 보내기
     types:
       one_time: 일회성
@@ -433,7 +427,7 @@ ko:
     widgets:
       blankslate:
         heading: 향후 미팅 없음
-        description: 본인이 주최자 또는 참가자인 향후 미팅이 여기에 표시됩니다.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: 모든 미팅 보기
   meeting_section:
     untitled_title: 제목 없는 섹션
diff --git a/modules/meeting/config/locales/crowdin/lt.yml b/modules/meeting/config/locales/crowdin/lt.yml
index 71217c49a65..a1b65d9f6b7 100644
--- a/modules/meeting/config/locales/crowdin/lt.yml
+++ b/modules/meeting/config/locales/crowdin/lt.yml
@@ -41,6 +41,8 @@ lt:
           other: "%{count} dalyviai"
         participants_attended: Būtinas dalyvis
         participants_invited: Pakviestas dalyvauti
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projektas
         start_date: Data
         start_time: Pradžios laikas
@@ -283,16 +285,6 @@ lt:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -306,6 +298,8 @@ lt:
         new_date_time: Nauja data/laikas
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -448,7 +442,7 @@ lt:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Bevardė skiltis
diff --git a/modules/meeting/config/locales/crowdin/lv.yml b/modules/meeting/config/locales/crowdin/lv.yml
index ec4b6ec7b89..2e2a3f02a9f 100644
--- a/modules/meeting/config/locales/crowdin/lv.yml
+++ b/modules/meeting/config/locales/crowdin/lv.yml
@@ -40,6 +40,8 @@ lv:
           other: "%{count} Participants"
         participants_attended: Apmeklētāji
         participants_invited: Ielūgumu saņēmēji
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekts
         start_date: Datums
         start_time: Start time
@@ -278,16 +280,6 @@ lv:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -301,6 +293,8 @@ lv:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -443,7 +437,7 @@ lv:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/mn.yml b/modules/meeting/config/locales/crowdin/mn.yml
index c7128137013..fe6222081ff 100644
--- a/modules/meeting/config/locales/crowdin/mn.yml
+++ b/modules/meeting/config/locales/crowdin/mn.yml
@@ -39,6 +39,8 @@ mn:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ mn:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ mn:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ mn:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/ms.yml b/modules/meeting/config/locales/crowdin/ms.yml
index 3c352b414ce..abd15f81d42 100644
--- a/modules/meeting/config/locales/crowdin/ms.yml
+++ b/modules/meeting/config/locales/crowdin/ms.yml
@@ -38,6 +38,8 @@ ms:
           other: "%{count} Peserta"
         participants_attended: Penghadir
         participants_invited: Tetamu-tetamu
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projek
         start_date: Tarikh
         start_time: Masa mula
@@ -270,16 +272,6 @@ ms:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -293,6 +285,8 @@ ms:
         new_date_time: Tarikh/masa baharu
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: Sekali
@@ -435,7 +429,7 @@ ms:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Bahagian tanpa tajuk
diff --git a/modules/meeting/config/locales/crowdin/ne.yml b/modules/meeting/config/locales/crowdin/ne.yml
index 2fa626fe256..e6151a8e802 100644
--- a/modules/meeting/config/locales/crowdin/ne.yml
+++ b/modules/meeting/config/locales/crowdin/ne.yml
@@ -39,6 +39,8 @@ ne:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ ne:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ ne:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ ne:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/nl.yml b/modules/meeting/config/locales/crowdin/nl.yml
index 11b14da7244..3a92d77c127 100644
--- a/modules/meeting/config/locales/crowdin/nl.yml
+++ b/modules/meeting/config/locales/crowdin/nl.yml
@@ -39,6 +39,8 @@ nl:
           other: "%{count} Deelnemers"
         participants_attended: Aanwezigen
         participants_invited: Genodigden
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Datum
         start_time: Starttijd
@@ -273,16 +275,6 @@ nl:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ nl:
         new_date_time: Nieuwe datum/tijd
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: E-mailuitnodiging naar deelnemers sturen
     types:
       one_time: Eenmalig
@@ -438,7 +432,7 @@ nl:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Naamloze sectie
diff --git a/modules/meeting/config/locales/crowdin/no.yml b/modules/meeting/config/locales/crowdin/no.yml
index 62b47a6b26e..7c9ac077f4e 100644
--- a/modules/meeting/config/locales/crowdin/no.yml
+++ b/modules/meeting/config/locales/crowdin/no.yml
@@ -39,6 +39,8 @@
           other: "%{count} Deltakere"
         participants_attended: Tilsluttete
         participants_invited: Inviterte
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Prosjekt
         start_date: Dato
         start_time: Starttid
@@ -273,16 +275,6 @@
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@
         new_date_time: Ny dato/tid
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Ikke navngitt del
diff --git a/modules/meeting/config/locales/crowdin/pl.yml b/modules/meeting/config/locales/crowdin/pl.yml
index 2001c6135bf..8a9aa4df172 100644
--- a/modules/meeting/config/locales/crowdin/pl.yml
+++ b/modules/meeting/config/locales/crowdin/pl.yml
@@ -41,6 +41,8 @@ pl:
           other: "%{count} uczestnika"
         participants_attended: Uczestnicy
         participants_invited: Zaproszone osoby
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Data
         start_time: Data rozpoczęcia
@@ -283,16 +285,6 @@ pl:
         summary_series: Seria spotkań „%{title}” została anulowana przez użytkownika %{actor} lub usunięto Cię jako uczestnika
         summary: "„%{title}” anulował użytkownik %{actor} lub usunięto Cię jako uczestnika"
         date_time: Zaplanowana data/godzina
-      participant_added:
-        header: Spotkanie „%{title}” — dodano uczestnika
-        header_series: Seria spotkań „%{title}” — dodano uczestnika
-        summary: Użytkownik %{actor} dodał uczestnika %{participant} do spotkania „%{title}”
-        summary_series: Użytkownik %{actor} dodał uczestnika %{participant} do serii spotkań „%{title}”
-      participant_removed:
-        header: Spotkanie „%{title}” — usunięto uczestnika
-        header_series: Seria spotkań „%{title}” — usunięto uczestnika
-        summary: Użytkownik %{actor} usunął uczestnika %{participant} ze spotkania „%{title}”
-        summary_series: Użytkownik %{actor} usunął uczestnika %{participant} z serii spotkań „%{title}”
       ended:
         header_series: 'Zakończono: serię spotkań „%{title}”'
         summary_series: Seria spotkań „%{title}” została zakończona przez użytkownika %{actor}
@@ -306,6 +298,8 @@ pl:
         new_date_time: Nowa data/godzina
         old_location: Stara lokalizacja
         new_location: Nowa lokalizacja
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Wyślij zaproszenie w wiadomości e-mail do uczestników
     types:
       one_time: Jednorazowe
@@ -448,7 +442,7 @@ pl:
     widgets:
       blankslate:
         heading: Brak nadchodzących spotkań
-        description: Tutaj pojawią się nadchodzące spotkania, w których jesteś organizatorem lub uczestnikiem.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: Wyświetl wszystkie spotkanie
   meeting_section:
     untitled_title: Sekcja bez nazwy
diff --git a/modules/meeting/config/locales/crowdin/pt-BR.yml b/modules/meeting/config/locales/crowdin/pt-BR.yml
index e82fa1e7526..325ee15aa22 100644
--- a/modules/meeting/config/locales/crowdin/pt-BR.yml
+++ b/modules/meeting/config/locales/crowdin/pt-BR.yml
@@ -39,6 +39,8 @@ pt-BR:
           other: "%{count} participantes"
         participants_attended: Presentes
         participants_invited: Convidados
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projeto
         start_date: Data
         start_time: Hora de início
@@ -273,16 +275,6 @@ pt-BR:
         summary_series: A série de reuniões "%{title}" foi cancelada por %{actor}, ou você foi removido como participante
         summary: '"%{title}" foi cancelada por %{actor}, ou você foi removido como participante'
         date_time: Data/hora programada
-      participant_added:
-        header: Reunião "%{title}" - Participante adicionado
-        header_series: Série de reuniões "%{title}" - Participante adicionado
-        summary: '%{actor} adicionou %{participant} à reunião "%{title}"'
-        summary_series: '%{actor} adicionou %{participant} à série de reuniões "%{title}"'
-      participant_removed:
-        header: Reunião "%{title}" - Participante removido
-        header_series: Série de reuniões "%{title}" - Participante removido
-        summary: '%{actor} removeu %{participant} da reunião "%{title}"'
-        summary_series: '%{actor} removeu %{participant} da série de reuniões "%{title}"'
       ended:
         header_series: 'Encerrada: série de reuniões "%{title}"'
         summary_series: A série de reuniões "%{title}" foi encerrada por %{actor}
@@ -296,6 +288,8 @@ pt-BR:
         new_date_time: Nova data/hora
         old_location: Localização antiga
         new_location: Nova localização
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Enviar convite por e-mail para todos os participantes
     types:
       one_time: Única
@@ -438,7 +432,7 @@ pt-BR:
     widgets:
       blankslate:
         heading: Nenhuma reunião futura
-        description: As próximas reuniões das quais você é organizador ou participante aparecerão aqui.
+        description: Próximas reuniões nas quais você participar aparecerão aqui.
       view_details: Visualizar todas as reuniões
   meeting_section:
     untitled_title: Seção sem título
diff --git a/modules/meeting/config/locales/crowdin/pt-PT.yml b/modules/meeting/config/locales/crowdin/pt-PT.yml
index 7951427254e..e17d9ddfb4c 100644
--- a/modules/meeting/config/locales/crowdin/pt-PT.yml
+++ b/modules/meeting/config/locales/crowdin/pt-PT.yml
@@ -39,6 +39,8 @@ pt-PT:
           other: "%{count} Participantes"
         participants_attended: Participantes
         participants_invited: Convidados
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projeto
         start_date: Data
         start_time: Hora de início
@@ -273,16 +275,6 @@ pt-PT:
         summary_series: A série de reuniões '%{title}' foi cancelada por %{actor}, ou foi removido como participante
         summary: "'%{title}' foi cancelado por %{actor}, ou foi removido como participante"
         date_time: Data/hora programada
-      participant_added:
-        header: Reunião '%{title}' - Participante adicionado
-        header_series: Série de reuniões '%{title}' - Participante adicionado
-        summary: "%{actor} adicionou %{participant} à reunião '%{title}'"
-        summary_series: "%{actor} adicionou %{participant} à série de reuniões '%{title}'"
-      participant_removed:
-        header: Reunião '%{title}' - Participante removido
-        header_series: Série de reuniões '%{title}' - Participante removido
-        summary: "%{actor} removeu %{participant} da reunião '%{title}'"
-        summary_series: "%{actor} removeu %{participant} da série de reuniões '%{title}'"
       ended:
         header_series: 'Terminada: Série de reuniões "%{title}"'
         summary_series: A série de reuniões "%{title}" foi terminada por %{actor}
@@ -296,6 +288,8 @@ pt-PT:
         new_date_time: Nova data/hora
         old_location: Localização antiga
         new_location: Nova localização
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Enviar e-mail de convite aos participantes
     types:
       one_time: Única
@@ -438,7 +432,7 @@ pt-PT:
     widgets:
       blankslate:
         heading: Não há reuniões futuras
-        description: As próximas reuniões em que é organizador ou participante aparecerão aqui.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: Ver todas as reuniões
   meeting_section:
     untitled_title: Secção sem título
diff --git a/modules/meeting/config/locales/crowdin/ro.yml b/modules/meeting/config/locales/crowdin/ro.yml
index 31e99668be7..04bce409251 100644
--- a/modules/meeting/config/locales/crowdin/ro.yml
+++ b/modules/meeting/config/locales/crowdin/ro.yml
@@ -40,6 +40,8 @@ ro:
           other: "%{count} participanți"
         participants_attended: Participanți
         participants_invited: Invitaţi
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Proiect
         start_date: Dată
         start_time: Dată început
@@ -278,16 +280,6 @@ ro:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -301,6 +293,8 @@ ro:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: O dată
@@ -443,7 +437,7 @@ ro:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/ru.yml b/modules/meeting/config/locales/crowdin/ru.yml
index 92e8f4077c4..74a22439601 100644
--- a/modules/meeting/config/locales/crowdin/ru.yml
+++ b/modules/meeting/config/locales/crowdin/ru.yml
@@ -41,6 +41,8 @@ ru:
           other: "%{count} Участников"
         participants_attended: Участники
         participants_invited: Приглашенные
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Проект
         start_date: Дата
         start_time: Время начала
@@ -220,7 +222,7 @@ ru:
   label_time_zone: Часовой пояс
   label_start_date: Дата начала
   label_subscribe_icalendar: Подписаться на календарь
-  label_recurring_filter: Recurring filter
+  label_recurring_filter: Повторяющийся фильтр
   caption_meeting_template_select: Выберите шаблон для автоматического копирования его повестки дня
   caption_template_project_select: Пожалуйста, выберите проект, в котором будет создан этот шаблон совещания
   placeholder_meeting_template_select_project_first: Сначала выберите проект
@@ -283,16 +285,6 @@ ru:
         summary_series: Серия совещаний '%{title}' была отменена %{actor}, или вы были удалены из списка участников
         summary: "'%{title}' было отменено %{actor}, или вы были удалены из списка участников"
         date_time: Запланированная дата/время
-      participant_added:
-        header: Совещание '%{title}' - участник добавлен
-        header_series: Серия совещаний '%{title}' - участник добавлен
-        summary: "%{actor} добавил %{participant} в совещание '%{title}'"
-        summary_series: "%{actor} добавил %{participant} в серию совещаний '%{title}'"
-      participant_removed:
-        header: Совещание '%{title}' - участник удален
-        header_series: Серия совещаний '%{title}' - участник удален
-        summary: "%{actor} удалил %{participant} из совещания '%{title}'"
-        summary_series: "%{actor} удалил %{participant} из серии совещаний '%{title}'"
       ended:
         header_series: 'Завершено: Серия совещаний ''%{title}'''
         summary_series: Серия совещаний '%{title}' была завершена %{actor}
@@ -306,6 +298,8 @@ ru:
         new_date_time: Новые дата/время
         old_location: Старое расположение
         new_location: Новое расположение
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Отправить письмо всем участникам
     types:
       one_time: Однократная
@@ -448,7 +442,7 @@ ru:
     widgets:
       blankslate:
         heading: Нет предстоящих встреч
-        description: Здесь будут отображаться предстоящие встречи, в которых Вы являетесь организатором или участником.
+        description: Здесь будут отображаться предстоящие встречи, в которых Вы принимаете участие.
       view_details: Просмотреть все встречи
   meeting_section:
     untitled_title: Раздел без названия
diff --git a/modules/meeting/config/locales/crowdin/rw.yml b/modules/meeting/config/locales/crowdin/rw.yml
index 036e5a1a81a..1434790eef2 100644
--- a/modules/meeting/config/locales/crowdin/rw.yml
+++ b/modules/meeting/config/locales/crowdin/rw.yml
@@ -39,6 +39,8 @@ rw:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ rw:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ rw:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ rw:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/si.yml b/modules/meeting/config/locales/crowdin/si.yml
index 7491a302838..bfdac77c649 100644
--- a/modules/meeting/config/locales/crowdin/si.yml
+++ b/modules/meeting/config/locales/crowdin/si.yml
@@ -39,6 +39,8 @@ si:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: ව්යාපෘති
         start_date: දිනය
         start_time: Start time
@@ -273,16 +275,6 @@ si:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ si:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ si:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/sk.yml b/modules/meeting/config/locales/crowdin/sk.yml
index 9dd67e6d6fa..0e02a315d4d 100644
--- a/modules/meeting/config/locales/crowdin/sk.yml
+++ b/modules/meeting/config/locales/crowdin/sk.yml
@@ -41,6 +41,8 @@ sk:
           other: "%{count} Participants"
         participants_attended: Účastníci
         participants_invited: Pozvaných
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Dátum
         start_time: Start time
@@ -283,16 +285,6 @@ sk:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -306,6 +298,8 @@ sk:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -448,7 +442,7 @@ sk:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/sl.yml b/modules/meeting/config/locales/crowdin/sl.yml
index a863be9387c..d302dcbfc0e 100644
--- a/modules/meeting/config/locales/crowdin/sl.yml
+++ b/modules/meeting/config/locales/crowdin/sl.yml
@@ -41,6 +41,8 @@ sl:
           other: "%{count} Participants"
         participants_attended: Udeleženi
         participants_invited: Povabljeni
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Datum
         start_time: Start time
@@ -283,16 +285,6 @@ sl:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -306,6 +298,8 @@ sl:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -448,7 +442,7 @@ sl:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/sr.yml b/modules/meeting/config/locales/crowdin/sr.yml
index d18ec63acd5..78838c7906a 100644
--- a/modules/meeting/config/locales/crowdin/sr.yml
+++ b/modules/meeting/config/locales/crowdin/sr.yml
@@ -40,6 +40,8 @@ sr:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -278,16 +280,6 @@ sr:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -301,6 +293,8 @@ sr:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -443,7 +437,7 @@ sr:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/sv.yml b/modules/meeting/config/locales/crowdin/sv.yml
index 1888ec6ef97..503a79d442a 100644
--- a/modules/meeting/config/locales/crowdin/sv.yml
+++ b/modules/meeting/config/locales/crowdin/sv.yml
@@ -39,6 +39,8 @@ sv:
           other: "%{count} deltagare"
         participants_attended: Deltagare
         participants_invited: Inbjudna
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Projekt
         start_date: Datum
         start_time: Starttid
@@ -273,16 +275,6 @@ sv:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Schemalagd datum/tid
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ sv:
         new_date_time: Nytt datum/tid
         old_location: Gammal plats
         new_location: Ny plats
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Skicka inbjudan via e-post till deltagarna
     types:
       one_time: En gång
@@ -438,7 +432,7 @@ sv:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Namnlös sektion
diff --git a/modules/meeting/config/locales/crowdin/th.yml b/modules/meeting/config/locales/crowdin/th.yml
index d29b99d2c59..1219a5d7cd2 100644
--- a/modules/meeting/config/locales/crowdin/th.yml
+++ b/modules/meeting/config/locales/crowdin/th.yml
@@ -38,6 +38,8 @@ th:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: โครงการ
         start_date: วันที่
         start_time: Start time
@@ -268,16 +270,6 @@ th:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -291,6 +283,8 @@ th:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -433,7 +427,7 @@ th:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/tr.yml b/modules/meeting/config/locales/crowdin/tr.yml
index a01be1cbe05..51f8e84c578 100644
--- a/modules/meeting/config/locales/crowdin/tr.yml
+++ b/modules/meeting/config/locales/crowdin/tr.yml
@@ -39,6 +39,8 @@ tr:
           other: "%{count} Katılımcı"
         participants_attended: Katılımcılar
         participants_invited: Davetliler
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Proje
         start_date: Tarih
         start_time: Başlama tarihi
@@ -273,16 +275,6 @@ tr:
         summary_series: Toplantı serisi '%{title}' %{actor}tarafından iptal edildi veya katılımcı olarak çıkarıldınız
         summary: "'%{title}' %{actor}tarafından iptal edildi veya katılımcı olarak çıkarıldınız"
         date_time: Planlanan tarih/saat
-      participant_added:
-        header: Toplantı '%{title}' - Katılımcı eklendi
-        header_series: Toplantı serisi '%{title}' - Katılımcı eklendi
-        summary: "%{actor} toplantıya %{participant} eklendi '%{title}'"
-        summary_series: "%{actor} '%{title}' toplantı serisine %{participant} eklendi"
-      participant_removed:
-        header: Toplantı '%{title}' - Katılımcı kaldırıldı
-        header_series: Toplantı serisi '%{title}' - Katılımcı kaldırıldı
-        summary: "%{actor} %{participant} adresini toplantıdan kaldırdı '%{title}'"
-        summary_series: "%{actor} %{participant} adresini '%{title}' toplantı serisinden kaldırdı"
       ended:
         header_series: 'Sona erdi: Toplantı serisi ''%{title}'''
         summary_series: "'%{title}' toplantısı serisi %{actor} tarafından sonlandırıldı."
@@ -296,6 +288,8 @@ tr:
         new_date_time: Yeni tarih/saat
         old_location: Eski konum
         new_location: Yeni konum
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Katılımcılara e-posta daveti gönder
     types:
       one_time: Tek seferlik
@@ -436,7 +430,7 @@ tr:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: İsimsiz bölüm
diff --git a/modules/meeting/config/locales/crowdin/uk.yml b/modules/meeting/config/locales/crowdin/uk.yml
index cb30708e00e..922f6215c18 100644
--- a/modules/meeting/config/locales/crowdin/uk.yml
+++ b/modules/meeting/config/locales/crowdin/uk.yml
@@ -41,6 +41,8 @@ uk:
           other: "%{count} учасника"
         participants_attended: Учасники
         participants_invited: Запрошені
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Проєкт
         start_date: Дата
         start_time: Час початку
@@ -283,16 +285,6 @@ uk:
         summary_series: Серію нарад «%{title}» скасував(-ла) %{actor}, або вас видалено з учасників
         summary: Нараду «%{title}» скасував(-ла) %{actor}, або вас видалено з учасників
         date_time: Заплановані дата/час
-      participant_added:
-        header: Нарада «%{title}» — додано учасника
-        header_series: Серія нарад «%{title}» — додано учасника
-        summary: Виконавець %{actor} додав учасника %{participant} до наради «%{title}»
-        summary_series: Виконавець %{actor} додав учасника %{participant} до серії нарад «%{title}»
-      participant_removed:
-        header: Нарада «%{title}» — вилучено учасника
-        header_series: Серія нарад «%{title}» — вилучено учасника
-        summary: Виконавець %{actor} вилучив учасника %{participant} із наради «%{title}»
-        summary_series: Виконавець %{actor} вилучив учасника %{participant} із серії нарад «%{title}»
       ended:
         header_series: 'Завершено: серія нарад «%{title}»'
         summary_series: Серію нарад «%{title}» завершив(-ла) %{actor}
@@ -306,6 +298,8 @@ uk:
         new_date_time: Нова дата/час
         old_location: Старе розташування
         new_location: Нове розташування
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Надіслати лист із запрошенням усім учасникам
     types:
       one_time: Одноразова
@@ -448,7 +442,7 @@ uk:
     widgets:
       blankslate:
         heading: Немає запланованих нарад
-        description: Тут з’являтимуться заплановані наради, у яких ви організатор або учасник.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: Переглянути всі наради
   meeting_section:
     untitled_title: Розділ без назви
diff --git a/modules/meeting/config/locales/crowdin/uz.yml b/modules/meeting/config/locales/crowdin/uz.yml
index fb2259ba500..6ff978d8dcd 100644
--- a/modules/meeting/config/locales/crowdin/uz.yml
+++ b/modules/meeting/config/locales/crowdin/uz.yml
@@ -39,6 +39,8 @@ uz:
           other: "%{count} Participants"
         participants_attended: Attendees
         participants_invited: Invitees
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: Project
         start_date: Date
         start_time: Start time
@@ -273,16 +275,6 @@ uz:
         summary_series: Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: Scheduled date/time
-      participant_added:
-        header: Meeting '%{title}' - Participant added
-        header_series: Meeting series '%{title}' - Participant added
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: Meeting '%{title}' - Participant removed
-        header_series: Meeting series '%{title}' - Participant removed
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: 'Ended: Meeting series ''%{title}'''
         summary_series: Meeting series '%{title}' has been ended by %{actor}
@@ -296,6 +288,8 @@ uz:
         new_date_time: New date/time
         old_location: Old location
         new_location: New location
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Send email invite to participants
     types:
       one_time: One-time
@@ -438,7 +432,7 @@ uz:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Untitled section
diff --git a/modules/meeting/config/locales/crowdin/vi.yml b/modules/meeting/config/locales/crowdin/vi.yml
index 30c4d4793bc..920f86192f1 100644
--- a/modules/meeting/config/locales/crowdin/vi.yml
+++ b/modules/meeting/config/locales/crowdin/vi.yml
@@ -38,6 +38,8 @@ vi:
           other: "%{count} Người tham gia"
         participants_attended: Người dự khán
         participants_invited: Khách mời
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: dự án
         start_date: ngày
         start_time: Thời gian bắt đầu
@@ -268,16 +270,6 @@ vi:
         summary_series: Chuỗi cuộc họp '%{title}' đã bị hủy bởi %{actor}, hoặc bạn đã bị loại khỏi danh sách tham gia
         summary: "'%{title}' đã bị hủy bởi ' %{actor}' hoặc bạn đã bị loại khỏi danh sách người tham gia"
         date_time: Ngày/giờ dự kiến
-      participant_added:
-        header: Họp '%{title}' - Thành viên tham gia đã được thêm vào
-        header_series: Chuỗi hội thảo '%{title}' - Thêm người tham gia
-        summary: "%{actor} Thêm %{participant} vào cuộc họp '%{title}'"
-        summary_series: '%{actor} Thêm " %{participant} " vào chuỗi sự kiện "%{title}"'
-      participant_removed:
-        header: Cuộc họp '%{title}' - Người tham gia đã bị loại bỏ
-        header_series: Chuỗi hội thảo '%{title}' - Người tham gia đã bị loại bỏ
-        summary: "%{actor} Đã loại bỏ ' %{participant} ' khỏi cuộc họp '%{title}'"
-        summary_series: '%{actor} Đã loại bỏ " %{participant} " khỏi chuỗi cuộc họp "%{title}"'
       ended:
         header_series: 'Đã kết thúc: Chuỗi cuộc họp ''%{title}'''
         summary_series: Chuỗi hội thảo '%{title}' đã kết thúc bởi %{actor}
@@ -291,6 +283,8 @@ vi:
         new_date_time: Ngày/giờ mới
         old_location: Vị trí cũ
         new_location: Vị trí mới
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: Gửi email mời đến người tham gia
     types:
       one_time: Một lần
@@ -433,7 +427,7 @@ vi:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: Phần không có tiêu đề
diff --git a/modules/meeting/config/locales/crowdin/zh-CN.yml b/modules/meeting/config/locales/crowdin/zh-CN.yml
index e5c1b17e89f..daf8e807d09 100644
--- a/modules/meeting/config/locales/crowdin/zh-CN.yml
+++ b/modules/meeting/config/locales/crowdin/zh-CN.yml
@@ -38,6 +38,8 @@ zh-CN:
           other: "%{count}位参与者"
         participants_attended: 与会者
         participants_invited: 受邀者
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: 项目
         start_date: 日期
         start_time: 开始时间
@@ -268,16 +270,6 @@ zh-CN:
         summary_series: 会议系列 '%{title}' 已被 %{actor} 取消，或者您的参与者身份已被移除
         summary: "'%{title}' 已被 %{actor} 取消，或者您的参与者身份已被移除"
         date_time: 预定日期/时间
-      participant_added:
-        header: 会议 '%{title}' - 已添加参加者
-        header_series: 会议系列 '%{title}' - 已添加参加者
-        summary: "%{actor} 将 %{participant} 添加到会议 '%{title}'"
-        summary_series: "%{actor} 将 %{participant} 添加到会议系列 '%{title}'"
-      participant_removed:
-        header: 会议 '%{title}' - 已移除参加者
-        header_series: 会议系列 '%{title}' - 已移除参加者
-        summary: "%{actor} 将 %{participant} 从会议 '%{title}' 中移除"
-        summary_series: "%{actor} 将 %{participant} 从会议系列 '%{title}' 中移除"
       ended:
         header_series: 结束：会议系列 '%{title}'
         summary_series: 会议系列 '%{title}' 已由 %{actor} 结束
@@ -291,6 +283,8 @@ zh-CN:
         new_date_time: 新日期/时间
         old_location: 原位置
         new_location: 新位置
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: 向参与者发送电子邮件邀请
     types:
       one_time: 动态
@@ -433,7 +427,7 @@ zh-CN:
     widgets:
       blankslate:
         heading: 无会议安排
-        description: 您组织或参与的即将举行的会议将显示在这里。
+        description: Upcoming meetings you are participating in will appear here.
       view_details: 查看所有会议
   meeting_section:
     untitled_title: 无标题章节
diff --git a/modules/meeting/config/locales/crowdin/zh-TW.yml b/modules/meeting/config/locales/crowdin/zh-TW.yml
index df33ee04e14..20c63146b14 100644
--- a/modules/meeting/config/locales/crowdin/zh-TW.yml
+++ b/modules/meeting/config/locales/crowdin/zh-TW.yml
@@ -38,6 +38,8 @@ zh-TW:
           other: "%{count} 位參與者"
         participants_attended: 出席人員
         participants_invited: 受邀人員
+        participants_added: 'Participants added:'
+        participants_removed: 'Participants removed:'
         project: 專案
         start_date: 日期
         start_time: 開始時間
@@ -270,16 +272,6 @@ zh-TW:
         summary_series: 會議系列 '%{title}' 已被 %{actor}取消, 或您已被移除為參與者
         summary: "%{title}' 已被 %{actor}取消，或者您已被刪除為參賽者"
         date_time: 排定日期/時間
-      participant_added:
-        header: 會議 '%{title}' - 與會者
-        header_series: 系列會議 '%{title}' - 與會者
-        summary: "%{actor} 加入 %{participant} 至會議 '%{title}'"
-        summary_series: "%{actor} 加入 %{participant} 至會議系列 '%{title}'"
-      participant_removed:
-        header: 會議 '%{title}' - 參與者已移除
-        header_series: 會議系列 '%{title}' - 已移除參與者
-        summary: "%{actor} 從會議中移除 %{participant} '%{title}'"
-        summary_series: "%{actor} 從會議系列中移除 %{participant} '%{title}'"
       ended:
         header_series: 結束：會議系列 '%{title}'
         summary_series: 會議系列 '%{title}' 已由 %{actor}結束
@@ -293,6 +285,8 @@ zh-TW:
         new_date_time: 新日期/時間
         old_location: 舊位置
         new_location: 新位置
+        added_participants: Added
+        removed_participants: Removed
     label_mail_all_participants: 發送電子郵件邀請參加者
     types:
       one_time: 一次性
@@ -435,7 +429,7 @@ zh-TW:
     widgets:
       blankslate:
         heading: No upcoming meetings
-        description: Upcoming meetings where you are the organizer or a participant will appear here.
+        description: Upcoming meetings you are participating in will appear here.
       view_details: View all meetings
   meeting_section:
     untitled_title: 無標題章節
diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml
index 57ae377fd63..5228a0c21cc 100644
--- a/modules/meeting/config/locales/en.yml
+++ b/modules/meeting/config/locales/en.yml
@@ -50,6 +50,8 @@ en:
           other: "%{count} Participants"
         participants_attended: "Attendees"
         participants_invited: "Invitees"
+        participants_added: "Participants added:"
+        participants_removed: "Participants removed:"
         project: "Project"
         start_date: "Date"
         start_time: "Start time"
@@ -291,16 +293,6 @@ en:
         summary_series: "Meeting series '%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         summary: "'%{title}' has been cancelled by %{actor}, or you have been removed as a participant"
         date_time: "Scheduled date/time"
-      participant_added:
-        header: "Meeting '%{title}' - Participant added"
-        header_series: "Meeting series '%{title}' - Participant added"
-        summary: "%{actor} added %{participant} to the meeting '%{title}'"
-        summary_series: "%{actor} added %{participant} to the meeting series '%{title}'"
-      participant_removed:
-        header: "Meeting '%{title}' - Participant removed"
-        header_series: "Meeting series '%{title}' - Participant removed"
-        summary: "%{actor} removed %{participant} from the meeting '%{title}'"
-        summary_series: "%{actor} removed %{participant} from the meeting series '%{title}'"
       ended:
         header_series: "Ended: Meeting series '%{title}'"
         summary_series: "Meeting series '%{title}' has been ended by %{actor}"
@@ -314,6 +306,8 @@ en:
         new_date_time: "New date/time"
         old_location: "Old location"
         new_location: "New location"
+        added_participants: "Added"
+        removed_participants: "Removed"
     label_mail_all_participants: "Send email invite to participants"
     types:
       one_time: "One-time"
@@ -451,7 +445,7 @@ en:
     widgets:
       blankslate:
         heading: "No upcoming meetings"
-        description: "Upcoming meetings where you are the organizer or a participant will appear here."
+        description: "Upcoming meetings you are participating in will appear here."
       view_details: "View all meetings"
 
   meeting_section:
diff --git a/modules/meeting/db/migrate/20260506000001_create_meeting_participant_journals.rb b/modules/meeting/db/migrate/20260506000001_create_meeting_participant_journals.rb
new file mode 100644
index 00000000000..8cbe92708bf
--- /dev/null
+++ b/modules/meeting/db/migrate/20260506000001_create_meeting_participant_journals.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreateMeetingParticipantJournals < ActiveRecord::Migration[8.0]
+  def change
+    create_table :meeting_participant_journals do |t|
+      t.integer :journal_id, null: false
+      t.integer :user_id, null: false
+      t.boolean :invited, default: false, null: false
+      t.boolean :attended, default: false, null: false
+      t.string :participation_status
+    end
+
+    add_index :meeting_participant_journals,
+              %i[journal_id user_id],
+              unique: true,
+              name: :idx_meeting_participant_journals_journal_user
+  end
+end
diff --git a/modules/meeting/frontend/module/main.ts b/modules/meeting/frontend/module/main.ts
index 9cc3d46e626..75f288ea526 100644
--- a/modules/meeting/frontend/module/main.ts
+++ b/modules/meeting/frontend/module/main.ts
@@ -24,7 +24,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 
-import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule, inject } from '@angular/core';
 import { OpSharedModule } from 'core-app/shared/shared.module';
 import { OpenprojectTabsModule } from 'core-app/shared/components/tabs/openproject-tabs.module';
 import {
@@ -104,7 +104,9 @@ export function initializeMeetingPlugin(injector:Injector) {
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeMeetingPlugin(injector);
   }
 }
diff --git a/modules/meeting/frontend/module/meetings-tab/meetings-tab.component.ts b/modules/meeting/frontend/module/meetings-tab/meetings-tab.component.ts
index 96d1f1ed93d..a700fb205ee 100644
--- a/modules/meeting/frontend/module/meetings-tab/meetings-tab.component.ts
+++ b/modules/meeting/frontend/module/meetings-tab/meetings-tab.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, inject } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/tab';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
@@ -39,15 +39,13 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class MeetingsTabComponent implements OnInit, TabComponent {
+  private elementRef = inject(ElementRef);
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() public workPackage:WorkPackageResource;
   turboFrameSrc:string;
 
-  constructor(
-    private elementRef:ElementRef,
-    readonly PathHelper:PathHelperService,
-    readonly I18n:I18nService,
-  ) {}
-
   ngOnInit():void {
     this.turboFrameSrc = `${this.PathHelper.projectWorkPackagePath(this.workPackage.project.id as string, this.workPackage.id as string)}/meetings/tab`;
   }
diff --git a/modules/meeting/lib/open_project/journal_formatter/participant_change.rb b/modules/meeting/lib/open_project/journal_formatter/participant_change.rb
new file mode 100644
index 00000000000..f1cde62fd7b
--- /dev/null
+++ b/modules/meeting/lib/open_project/journal_formatter/participant_change.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class OpenProject::JournalFormatter::ParticipantChange < JournalFormatter::Base
+  def render(key, values, options = { html: true })
+    label_text = label(key)
+    label_text = content_tag(:strong, label_text) if options[:html]
+
+    value_text = values.last.to_s
+    value_text = content_tag(:i, h(value_text)) if options[:html]
+
+    I18n.t(:text_journal_of, label: label_text, value: value_text)
+  end
+end
diff --git a/modules/meeting/lib/open_project/meeting/engine.rb b/modules/meeting/lib/open_project/meeting/engine.rb
index a8df2aa424f..9d3cb5ccb1a 100644
--- a/modules/meeting/lib/open_project/meeting/engine.rb
+++ b/modules/meeting/lib/open_project/meeting/engine.rb
@@ -197,6 +197,7 @@ module OpenProject::Meeting
       end
 
       Journals::CreateService::Association.register(:AgendaItemable)
+      Journals::CreateService::Association.register(:Participatable)
     end
 
     add_api_path :meetings do
diff --git a/modules/meeting/spec/features/meeting_notifications_spec.rb b/modules/meeting/spec/features/meeting_notifications_spec.rb
index 10d989aa1da..6c32898a25a 100644
--- a/modules/meeting/spec/features/meeting_notifications_spec.rb
+++ b/modules/meeting/spec/features/meeting_notifications_spec.rb
@@ -46,6 +46,11 @@ RSpec.describe "Meeting notifications", :js do
     login_as(user)
   end
 
+  def perform_debounced_meeting_notification_jobs
+    perform_enqueued_jobs(only: Meetings::NotificationDebounceJob, at: 2.minutes.from_now)
+    perform_enqueued_jobs
+  end
+
   shared_examples "notification checkbox behaviour" do
     it "shows checkbox checked initially" do
       page.find_by_id("open-meeting-button").click
@@ -104,7 +109,7 @@ RSpec.describe "Meeting notifications", :js do
       wait_for_network_idle
 
       # check if mail is sent on opening meeting (Bug #70109)
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -130,7 +135,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -183,7 +188,7 @@ RSpec.describe "Meeting notifications", :js do
 
       expect_flash(message: "Email calendar update sent to all participants")
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -199,7 +204,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 0
 
       show_page.trigger_dropdown_menu_item "Delete meeting"
@@ -211,7 +216,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 0
     end
   end
@@ -263,7 +268,7 @@ RSpec.describe "Meeting notifications", :js do
       wait_for_network_idle
 
       # check if mail is sent on opening first meeting
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -293,7 +298,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -324,7 +329,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -369,7 +374,7 @@ RSpec.describe "Meeting notifications", :js do
       wait_for_network_idle
       expect_flash(type: :success, message: "Successful deletion.")
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 0
     end
 
@@ -380,7 +385,7 @@ RSpec.describe "Meeting notifications", :js do
       wait_for_network_idle
 
       # check for initial invitation mail
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
       ActionMailer::Base.deliveries.clear
 
@@ -414,7 +419,7 @@ RSpec.describe "Meeting notifications", :js do
       expect(meeting.template.reload.notify).to be true
 
       # check for invitation mail on re-enabling notifications
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 1
     end
   end
@@ -498,7 +503,7 @@ RSpec.describe "Meeting notifications", :js do
         show_page.expect_participant(third_user)
       end
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
 
       # 1 to the invited user + 2 to the existing participants
       expect(ActionMailer::Base.deliveries.size).to eq 3
@@ -520,7 +525,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
 
       # 1 to the removed user + 2 to the existing participants
       expect(ActionMailer::Base.deliveries.size).to eq 3
@@ -570,19 +575,19 @@ RSpec.describe "Meeting notifications", :js do
         show_page.expect_participant(third_user, editable: false)
       end
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
 
-      # apply_to_upcoming is enabled by default on templates.
-      # 3 mails for template (invite + 2 participant_added) and
-      # 2 mails for the upcoming instantiated occurrence (invite + participant_added).
-      expect(ActionMailer::Base.deliveries.size).to eq 5
+      # apply_to_upcoming is enabled by default on templates, but occurrence propagation
+      # runs with notify: false. Only the template sends mails:
+      # 1 invite to the new participant + 2 updates to existing participants.
+      expect(ActionMailer::Base.deliveries.size).to eq 3
 
       recipients = ActionMailer::Base.deliveries.map(&:to).flatten
       expect(recipients.tally)
         .to eq({
-                 user.mail => 2,
+                 user.mail => 1,
                  other_user.mail => 1,
-                 third_user.mail => 2
+                 third_user.mail => 1
                })
     end
 
@@ -599,7 +604,7 @@ RSpec.describe "Meeting notifications", :js do
 
       wait_for_network_idle
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
 
       # 1 to the removed user + 2 to the existing participants
       expect(ActionMailer::Base.deliveries.size).to eq 3
diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb
index f729b87b8bb..3e46ddaa62c 100644
--- a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb
+++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb
@@ -78,6 +78,11 @@ RSpec.describe "Recurring meetings creation",
     travel_back
   end
 
+  def perform_debounced_meeting_notification_jobs
+    perform_enqueued_jobs(only: Meetings::NotificationDebounceJob, at: 2.minutes.from_now)
+    perform_enqueued_jobs
+  end
+
   context "with a user with permissions" do
     it "can create a recurring meeting" do
       login_as current_user
@@ -125,7 +130,7 @@ RSpec.describe "Recurring meetings creation",
 
       expect(page).to have_css("#meetings-side-panel-participants-component", text: 2)
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 0
 
       # Before exiting draft mode, user is always redirected to the template
@@ -154,7 +159,7 @@ RSpec.describe "Recurring meetings creation",
       show_page.expect_planned_meeting date: "01/07/2025 01:30 PM"
       show_page.expect_planned_meeting date: "01/14/2025 01:30 PM"
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 2
       expect(ActionMailer::Base.deliveries.map(&:to).flatten)
         .to contain_exactly user.mail, other_user.mail
@@ -182,9 +187,10 @@ RSpec.describe "Recurring meetings creation",
 
       expect(page).to have_css("#meetings-side-panel-participants-component", text: 3)
 
-      perform_enqueued_jobs
+      perform_debounced_meeting_notification_jobs
       expect(ActionMailer::Base.deliveries.size).to eq 3
-      expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(third_user.mail)
+      expect(ActionMailer::Base.deliveries.map(&:to).flatten)
+        .to contain_exactly user.mail, other_user.mail, third_user.mail
     end
   end
 
diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb
index a6a8d549209..9c13c30f7dc 100644
--- a/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb
@@ -36,6 +36,11 @@ RSpec.describe "Meetings participants",
                :js do
   include Components::Autocompleter::NgSelectAutocompleteHelpers
 
+  def perform_debounced_meeting_notification_jobs
+    perform_enqueued_jobs(only: Meetings::NotificationDebounceJob, at: 2.minutes.from_now)
+    perform_enqueued_jobs
+  end
+
   shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) }
   shared_let(:user) do
     create(:user,
@@ -114,7 +119,7 @@ RSpec.describe "Meetings participants",
 
     wait_for_network_idle
 
-    perform_enqueued_jobs
+    perform_debounced_meeting_notification_jobs
     expect(ActionMailer::Base.deliveries.size).to eq 2
     ActionMailer::Base.deliveries.clear
 
@@ -124,7 +129,7 @@ RSpec.describe "Meetings participants",
 
     wait_for_network_idle
 
-    perform_enqueued_jobs
+    perform_debounced_meeting_notification_jobs
     expect(ActionMailer::Base.deliveries.size).to eq 2
   end
 
diff --git a/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb b/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb
index a1174bdf265..db120a0e6a1 100644
--- a/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb
@@ -666,24 +666,10 @@ RSpec.describe "Open the Meetings tab",
             expect(page).to have_css(".ng-option", text: "Series backlog")
           end
 
-          it "shows no preselection when no sections exist for recurring meeting occurrences" do
+          it "shows the automatically created untitled section when no sections exist for recurring meeting occurrences" do
             meeting = empty_recurring_meeting_occurrence
 
-            work_package_page.visit!
-            switch_to_meetings_tab
-
-            meetings_tab.open_add_to_meeting_dialog
-
-            fill_in("meeting_agenda_item_meeting_id", with: meeting.title)
-            page.find(".ng-option-marked", text: meeting.title)
-            page.find(".ng-option-marked").click
-
-            wait_for_network_idle
-
-            section_field = find_field("meeting_agenda_item_meeting_section_id")
-            expect(section_field).not_to be_disabled
-
-            expect(page).to have_no_css(".ng-value-label")
+            check_section_auto_selection(meeting, "Untitled section")
           end
 
           it "updates section selection when switching between meetings" do
diff --git a/modules/meeting/spec/forms/meeting/add_to_section_spec.rb b/modules/meeting/spec/forms/meeting/add_to_section_spec.rb
new file mode 100644
index 00000000000..f4f25e0ce58
--- /dev/null
+++ b/modules/meeting/spec/forms/meeting/add_to_section_spec.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Meeting::AddToSection, type: :forms do
+  include_context "with rendered form"
+
+  shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) }
+  shared_let(:user) { create(:user) }
+
+  let(:params) { {} }
+
+  def section_option_names
+    expect(page).to have_css("opce-autocompleter")
+    JSON.parse(page.find("opce-autocompleter")["data-items"]).map { |o| o["name"] }
+  end
+
+  # Sections must be created inside `let(:model)` so they exist when the form is evaluated.
+  # The shared context renders the form in an outer `before` hook, which runs before any
+  # `let!` inner hooks — so data must be set up as part of the model itself.
+
+  context "when the meeting has named sections" do
+    let(:model) do
+      meeting = create(:meeting, project:, author: user)
+      create(:meeting_section, meeting:, title: "Section A")
+      create(:meeting_section, meeting:, title: "Section B")
+      meeting.sections.reload
+      create(:meeting_agenda_item, meeting:)
+    end
+
+    it "lists named sections and the backlog, without a placeholder" do
+      expect(section_option_names).to include("Section A", "Section B", "Agenda backlog")
+      expect(section_option_names).not_to include("Untitled section")
+    end
+  end
+
+  context "when the meeting has no named sections" do
+    let(:model) do
+      meeting = create(:meeting, project:, author: user)
+      create(:meeting_agenda_item, meeting:)
+    end
+
+    it "inserts an untitled placeholder before the backlog" do
+      expect(section_option_names).to eq(["Untitled section", "Agenda backlog"])
+    end
+  end
+
+  context "when an occurrence with no named sections is given" do
+    let(:model) do
+      recurring_meeting = create(:recurring_meeting, project:, author: user)
+      create(:recurring_meeting_occurrence, project:, recurring_meeting:)
+      create(:meeting_agenda_item, meeting: recurring_meeting.template)
+    end
+    let(:params) do
+      recurring_meeting = model.meeting.recurring_meeting
+      { occurrence: recurring_meeting.meetings.where(template: false).first }
+    end
+
+    it "inserts an untitled placeholder before the series backlog" do
+      expect(section_option_names).to include("Untitled section")
+    end
+  end
+end
diff --git a/modules/meeting/spec/mailers/meeting_mailer_spec.rb b/modules/meeting/spec/mailers/meeting_mailer_spec.rb
index 88af3961189..108d9484a33 100644
--- a/modules/meeting/spec/mailers/meeting_mailer_spec.rb
+++ b/modules/meeting/spec/mailers/meeting_mailer_spec.rb
@@ -369,62 +369,46 @@ RSpec.describe MeetingMailer do
     end
   end
 
-  describe "participant_added" do
-    let(:added_participant_name) { "New Participant" }
-    let(:mail) { described_class.participant_added(meeting, watcher1, author, added_participant: added_participant_name) }
-
-    it "renders the headers" do
-      expect(mail.subject).to include(meeting.project.name)
-      expect(mail.subject).to include("Participant added")
-      expect(mail.to).to contain_exactly(watcher1.mail)
-      expect(mail.from).to eq([ApplicationMailer.reply_to_address])
+  describe "updated with participant changes" do
+    let(:meeting) do
+      create(:meeting,
+             author:,
+             project:,
+             start_time: "2021-11-09T23:00:00 +0100".to_datetime.utc)
+    end
+    let(:changes) do
+      { old_start: meeting.start_time,
+        new_start: meeting.start_time,
+        old_duration: 1,
+        new_duration: 1,
+        old_location: nil,
+        new_location: nil }
+    end
+    let(:added_names) { ["Added Person"] }
+    let(:removed_names) { ["Removed Person"] }
+    let(:mail) do
+      described_class.updated(meeting, watcher1, author,
+                              changes:,
+                              added_participants: added_names,
+                              removed_participants: removed_names)
     end
 
-    it "renders the text body with participant info" do
+    it "renders added participants bold in the html body" do
       User.execute_as(watcher1) do
-        expect(mail.text_part.body).to include(meeting.project.name)
-        expect(mail.text_part.body).to include(meeting.title)
-        expect(mail.text_part.body).to include(added_participant_name)
-        expect(mail.text_part.body).to include(author.name)
+        expect(mail.html_part.body).to include(added_names.first)
       end
     end
 
-    it "renders the html body with participant info" do
+    it "renders removed participants with strikethrough in the html body" do
       User.execute_as(watcher1) do
-        expect(mail.html_part.body).to include(meeting.project.name)
-        expect(mail.html_part.body).to include(meeting.title)
-        expect(mail.html_part.body).to include(added_participant_name)
-        expect(mail.html_part.body).to include(author.name)
-      end
-    end
-  end
-
-  describe "participant_removed" do
-    let(:removed_participant_name) { "Removed Participant" }
-    let(:mail) { described_class.participant_removed(meeting, watcher1, author, removed_participant: removed_participant_name) }
-
-    it "renders the headers" do
-      expect(mail.subject).to include(meeting.project.name)
-      expect(mail.subject).to include("Participant removed")
-      expect(mail.to).to contain_exactly(watcher1.mail)
-      expect(mail.from).to eq([ApplicationMailer.reply_to_address])
-    end
-
-    it "renders the text body with participant info" do
-      User.execute_as(watcher1) do
-        expect(mail.text_part.body).to include(meeting.project.name)
-        expect(mail.text_part.body).to include(meeting.title)
-        expect(mail.text_part.body).to include(removed_participant_name)
-        expect(mail.text_part.body).to include(author.name)
+        expect(mail.html_part.body).to include("<s>#{removed_names.first}</s>")
       end
     end
 
-    it "renders the html body with participant info" do
+    it "renders added and removed participants in the text body" do
       User.execute_as(watcher1) do
-        expect(mail.html_part.body).to include(meeting.project.name)
-        expect(mail.html_part.body).to include(meeting.title)
-        expect(mail.html_part.body).to include(removed_participant_name)
-        expect(mail.html_part.body).to include(author.name)
+        expect(mail.text_part.body).to include(added_names.first)
+        expect(mail.text_part.body).to include(removed_names.first)
       end
     end
   end
diff --git a/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb b/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb
index 0261384d536..f3c834650ca 100644
--- a/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb
+++ b/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb
@@ -155,62 +155,33 @@ RSpec.describe MeetingSeriesMailer do
     end
   end
 
-  describe "participant_added" do
-    let(:added_participant_name) { "New Participant" }
-    let(:mail) { described_class.participant_added(series, recipient, author, added_participant: added_participant_name) }
-
-    it "renders the headers" do
-      expect(mail.subject).to include(series.project.name)
-      expect(mail.subject).to include("Participant added")
-      expect(mail.to).to contain_exactly(recipient.mail)
-      expect(mail.from).to eq([ApplicationMailer.reply_to_address])
+  describe "updated with participant changes" do
+    let(:changes) { { old_schedule: "some old schedule", old_location: "some old location" } }
+    let(:added_names) { ["Added Person"] }
+    let(:removed_names) { ["Removed Person"] }
+    let(:mail) do
+      described_class.updated(series, recipient, author,
+                              changes:,
+                              added_participants: added_names,
+                              removed_participants: removed_names)
     end
 
-    it "renders the text body with participant info" do
+    it "renders added participants bold in the html body" do
       User.execute_as(recipient) do
-        expect(mail.text_part.body).to include(series.project.name)
-        expect(mail.text_part.body).to include(series.title)
-        expect(mail.text_part.body).to include(added_participant_name)
-        expect(mail.text_part.body).to include(author.name)
+        expect(mail.html_part.body).to include(added_names.first)
       end
     end
 
-    it "renders the html body with participant info" do
+    it "renders removed participants with strikethrough in the html body" do
       User.execute_as(recipient) do
-        expect(mail.html_part.body).to include(series.project.name)
-        expect(mail.html_part.body).to include(series.title)
-        expect(mail.html_part.body).to include(added_participant_name)
-        expect(mail.html_part.body).to include(author.name)
-      end
-    end
-  end
-
-  describe "participant_removed" do
-    let(:removed_participant_name) { "Removed Participant" }
-    let(:mail) { described_class.participant_removed(series, recipient, author, removed_participant: removed_participant_name) }
-
-    it "renders the headers" do
-      expect(mail.subject).to include(series.project.name)
-      expect(mail.subject).to include("Participant removed")
-      expect(mail.to).to contain_exactly(recipient.mail)
-      expect(mail.from).to eq([ApplicationMailer.reply_to_address])
-    end
-
-    it "renders the text body with participant info" do
-      User.execute_as(recipient) do
-        expect(mail.text_part.body).to include(series.project.name)
-        expect(mail.text_part.body).to include(series.title)
-        expect(mail.text_part.body).to include(removed_participant_name)
-        expect(mail.text_part.body).to include(author.name)
+        expect(mail.html_part.body).to include("<s>#{removed_names.first}</s>")
       end
     end
 
-    it "renders the html body with participant info" do
+    it "renders added and removed participants in the text body" do
       User.execute_as(recipient) do
-        expect(mail.html_part.body).to include(series.project.name)
-        expect(mail.html_part.body).to include(series.title)
-        expect(mail.html_part.body).to include(removed_participant_name)
-        expect(mail.html_part.body).to include(author.name)
+        expect(mail.text_part.body).to include(added_names.first)
+        expect(mail.text_part.body).to include(removed_names.first)
       end
     end
   end
diff --git a/modules/meeting/spec/models/meeting_acts_as_journalized_spec.rb b/modules/meeting/spec/models/meeting_acts_as_journalized_spec.rb
index b502bace466..044debcb33a 100644
--- a/modules/meeting/spec/models/meeting_acts_as_journalized_spec.rb
+++ b/modules/meeting/spec/models/meeting_acts_as_journalized_spec.rb
@@ -280,6 +280,136 @@ RSpec.describe Meeting do
     end
   end
 
+  describe "participants" do
+    shared_let(:participant_user) { create(:user) }
+
+    let(:participant) { meeting.participants.find_by(user: participant_user) }
+    let(:participant_journals) { meeting.journals.last.participant_journals }
+
+    before do
+      meeting.participants << MeetingParticipant.new(user: participant_user, invited: true, attended: false)
+      meeting.touch_and_save_journals
+    end
+
+    context "when a participant is added" do
+      it "creates a participant journal entry" do
+        expect(participant_journals.count).to eq(1)
+      end
+
+      it "records the correct user, invited, and attended values" do
+        expect(participant_journals.last).to have_attributes(
+          user_id: participant_user.id,
+          invited: true,
+          attended: false
+        )
+      end
+    end
+
+    context "when a participant is removed", with_settings: { journal_aggregation_time_minutes: 0 } do
+      subject(:remove_participant) do
+        participant.destroy
+        meeting.touch_and_save_journals
+      end
+
+      it "creates a new journal" do
+        expect { remove_participant }.to change { meeting.journals.count }.by(1)
+      end
+
+      it "removes the participant journal from the new journal" do
+        remove_participant
+        expect(meeting.journals.last.participant_journals).to be_empty
+      end
+
+      it "keeps the participant journal in the previous journal" do
+        remove_participant
+
+        previous_journal = meeting.journals.order(:id).second_to_last
+        expect(previous_journal.participant_journals.count).to eq(1)
+        expect(previous_journal.participant_journals.first.user_id).to eq(participant_user.id)
+      end
+    end
+
+    context "when a participant's invited status changes", with_settings: { journal_aggregation_time_minutes: 0 } do
+      subject(:update_participant) do
+        participant.update!(invited: false)
+        meeting.touch_and_save_journals
+      end
+
+      it "creates a new journal" do
+        expect { update_participant }.to change { meeting.journals.count }.by(1)
+      end
+
+      it "reflects the updated invited value in the new journal" do
+        update_participant
+        expect(meeting.journals.last.participant_journals.last).to have_attributes(invited: false)
+      end
+    end
+
+    context "when no participant changes occur" do
+      it "does not create a new journal" do
+        expect do
+          meeting.save_journals
+        end.not_to change(Journal, :count)
+      end
+    end
+
+    context "when save_journals is called again within the aggregation window (regression: PG::UniqueViolation)" do
+      it "does not raise a unique violation" do
+        # Simulates save_journals being called a second time while the first journal is still
+        # the aggregation predecessor (e.g., template_completed updates the meeting right after creation)
+        meeting.update_column(:title, "Updated title")
+        expect { meeting.save_journals }.not_to raise_error
+      end
+
+      it "participant journals reflect the current state" do
+        meeting.update_column(:title, "Updated title")
+        meeting.save_journals
+        expect(meeting.journals.last.participant_journals.count).to eq(1)
+      end
+    end
+  end
+
+  describe "participant change details" do
+    shared_let(:participant505) { create(:user, firstname: "Participant", lastname: "505") }
+    shared_let(:participant401) { create(:user, firstname: "Oliver", lastname: "Captchatest") }
+    shared_let(:participant502) { create(:user, firstname: "Test", lastname: "Calculated Values") }
+    shared_let(:participant328) { create(:user, firstname: "Participant", lastname: "328") }
+    shared_let(:participant329) { create(:user, firstname: "Test", lastname: "User 329") }
+
+    let(:details_meeting) do
+      User.execute_as current_user do
+        create(:meeting, author: user)
+      end
+    end
+
+    it "computes added and removed participants from previous snapshot in journal order",
+       with_settings: { journal_aggregation_time_minutes: 0 } do
+      details_meeting.participants << MeetingParticipant.new(user: participant505, invited: true, attended: false)
+      details_meeting.touch_and_save_journals
+
+      details_meeting.participants << MeetingParticipant.new(user: participant401, invited: true, attended: false)
+      details_meeting.participants << MeetingParticipant.new(user: participant502, invited: true, attended: false)
+      details_meeting.touch_and_save_journals
+
+      details_meeting.participants.find_by(user: participant502).destroy!
+      details_meeting.participants << MeetingParticipant.new(user: participant328, invited: true, attended: false)
+      details_meeting.participants << MeetingParticipant.new(user: participant329, invited: true, attended: false)
+      details_meeting.touch_and_save_journals
+
+      details_meeting.participants.find_by(user: participant401).destroy!
+      details_meeting.participants.find_by(user: participant329).destroy!
+      details_meeting.touch_and_save_journals
+
+      journal = details_meeting.journals.last
+      allow(journal).to receive(:predecessor).and_return(details_meeting.journals.first)
+
+      expect(journal.details).to include(
+        participants_removed: [nil, "Oliver Captchatest, Test User 329"]
+      )
+      expect(journal.details[:participants_added]).to be_nil
+    end
+  end
+
   describe "#destroy" do
     let(:meeting_agenda_item) { create(:meeting_agenda_item, meeting:) }
 
diff --git a/modules/meeting/spec/requests/meeting_participants_spec.rb b/modules/meeting/spec/requests/meeting_participants_spec.rb
index b311b38b455..9f2b49b2ff4 100644
--- a/modules/meeting/spec/requests/meeting_participants_spec.rb
+++ b/modules/meeting/spec/requests/meeting_participants_spec.rb
@@ -76,8 +76,9 @@ RSpec.describe "MeetingParticipants requests",
 
       it "sends notification email" do
         expect do
-          post project_meeting_participants_path(project, meeting), params: params, as: :turbo_stream
-          perform_enqueued_jobs
+          perform_enqueued_jobs do
+            post project_meeting_participants_path(project, meeting), params: params, as: :turbo_stream
+          end
         end.to change { ActionMailer::Base.deliveries.size }.by(1)
       end
     end
@@ -327,8 +328,9 @@ RSpec.describe "MeetingParticipants requests",
         end
 
         it "only sends series invitation emails" do
-          post project_meeting_participants_path(project, template), params: add_params, as: :turbo_stream
-          perform_enqueued_jobs
+          perform_enqueued_jobs do
+            post project_meeting_participants_path(project, template), params: add_params, as: :turbo_stream
+          end
 
           # 1 series invite to new participant + 1 participant added email to existing participant
           expect(ActionMailer::Base.deliveries.size).to eq(2)
@@ -369,14 +371,19 @@ RSpec.describe "MeetingParticipants requests",
           expect(recurring_meeting.meetings.not_templated.find_by(recurrence_start_time: future_occurrence_time)).to be_nil
         end
 
-        it "sends emails for series and open occurrences, but not closed" do
-          post project_meeting_participants_path(project, template), params:, as: :turbo_stream
-          perform_enqueued_jobs
+        it "sends emails only for the template change, not for propagated occurrences" do
+          perform_enqueued_jobs do
+            post project_meeting_participants_path(project, template), params:, as: :turbo_stream
+          end
 
-          # 1 series invite to new participant + 1 participant added email to existing participant + 1 occurrence invite
-          expect(ActionMailer::Base.deliveries.size).to eq(3)
+          # Applying to upcoming propagates participant records to occurrence meetings,
+          # but those CreateService calls run with notify: false.
+          # So only the template action sends:
+          # - 1 invite to the added participant
+          # - 1 update to the existing template participant
+          expect(ActionMailer::Base.deliveries.size).to eq(2)
           expect(ActionMailer::Base.deliveries.map(&:to).flatten)
-            .to include(user_with_meeting_permissions.mail, user.mail)
+            .to contain_exactly(user_with_meeting_permissions.mail, user.mail)
         end
       end
     end
@@ -402,8 +409,9 @@ RSpec.describe "MeetingParticipants requests",
         end
 
         it "only sends template cancellation emails" do
-          delete project_meeting_participant_path(project, template, template_participant), as: :turbo_stream
-          perform_enqueued_jobs
+          perform_enqueued_jobs do
+            delete project_meeting_participant_path(project, template, template_participant), as: :turbo_stream
+          end
 
           # 1 cancelled series to removed participant + 1 participant removed to remaining template participant
           expect(ActionMailer::Base.deliveries.size).to eq(2)
@@ -448,15 +456,20 @@ RSpec.describe "MeetingParticipants requests",
           expect(recurring_meeting.meetings.not_templated.find_by(recurrence_start_time: future_occurrence_time)).to be_nil
         end
 
-        it "sends cancellation emails for template and open occurrences, but not closed" do
-          delete project_meeting_participant_path(project, template, template_participant),
-                 params: delete_params, as: :turbo_stream
-          perform_enqueued_jobs
+        it "sends cancellation emails only for the template change, not for propagated occurrences" do
+          perform_enqueued_jobs do
+            delete project_meeting_participant_path(project, template, template_participant),
+                   params: delete_params, as: :turbo_stream
+          end
 
-          # 1 cancelled series to removed participant + 1 participant removed to remaining participant +
-          # 1 occurrence cancelled
-          expect(ActionMailer::Base.deliveries.size).to eq(3)
-          expect(ActionMailer::Base.deliveries.map(&:to).flatten).to include(user_with_meeting_permissions.mail)
+          # Applying to upcoming propagates removals to occurrence meetings,
+          # but those DeleteService calls run with notify: false.
+          # So only the template action sends:
+          # - 1 cancellation to removed participant
+          # - 1 update to the remaining template participant
+          expect(ActionMailer::Base.deliveries.size).to eq(2)
+          expect(ActionMailer::Base.deliveries.map(&:to).flatten)
+            .to contain_exactly(user_with_meeting_permissions.mail, user.mail)
         end
       end
     end
diff --git a/modules/meeting/spec/services/meeting_participants/create_service_spec.rb b/modules/meeting/spec/services/meeting_participants/create_service_spec.rb
index 565adc65d12..b32ed3b0602 100644
--- a/modules/meeting/spec/services/meeting_participants/create_service_spec.rb
+++ b/modules/meeting/spec/services/meeting_participants/create_service_spec.rb
@@ -53,6 +53,33 @@ RSpec.describe MeetingParticipants::CreateService do
         expect(subject.result.invited).to be true
         expect(subject.result.attended).to be false
       end
+
+      it "triggers the notification debounce job with since_invited_ids" do
+        allow(Meetings::NotificationDebounceJob).to receive(:debounce)
+        subject
+        expect(Meetings::NotificationDebounceJob).to have_received(:debounce).with(meeting, since_invited_ids: anything)
+      end
+
+      context "when notify: false" do
+        subject do
+          described_class.new(user: current_user, notify: false).call(meeting:, user_id:, invited: true, attended: false)
+        end
+
+        it "creates the participant" do
+          expect { subject }.to change { meeting.participants.count }.by(1)
+        end
+
+        it "does not trigger the notification debounce job" do
+          allow(Meetings::NotificationDebounceJob).to receive(:debounce)
+          subject
+          expect(Meetings::NotificationDebounceJob).not_to have_received(:debounce)
+        end
+      end
+
+      it "saves a new journal for the meeting",
+         with_settings: { journal_aggregation_time_minutes: 0 } do
+        expect { subject }.to change { meeting.journals.count }
+      end
     end
 
     context "when user does not have meeting permissions" do
diff --git a/modules/meeting/spec/services/meeting_participants/delete_service_spec.rb b/modules/meeting/spec/services/meeting_participants/delete_service_spec.rb
index 555068f0bd3..45dc5a446f6 100644
--- a/modules/meeting/spec/services/meeting_participants/delete_service_spec.rb
+++ b/modules/meeting/spec/services/meeting_participants/delete_service_spec.rb
@@ -49,6 +49,36 @@ RSpec.describe MeetingParticipants::DeleteService do
 
         expect(subject).to be_success
       end
+
+      it "triggers the notification debounce job with since_invited_ids" do
+        participant
+        allow(Meetings::NotificationDebounceJob).to receive(:debounce)
+        subject
+        expect(Meetings::NotificationDebounceJob).to have_received(:debounce).with(meeting, since_invited_ids: anything)
+      end
+
+      context "when notify: false" do
+        subject { described_class.new(user: current_user, model: participant, notify: false).call }
+
+        it "deletes the participant" do
+          participant
+          expect { subject }.to change { meeting.participants.count }.by(-1)
+        end
+
+        it "does not trigger the notification debounce job" do
+          participant
+          allow(Meetings::NotificationDebounceJob).to receive(:debounce)
+          subject
+          expect(Meetings::NotificationDebounceJob).not_to have_received(:debounce)
+        end
+      end
+
+      it "saves a new journal for the meeting reflecting the participant removal",
+         with_settings: { journal_aggregation_time_minutes: 0 } do
+        participant
+        meeting.touch_and_save_journals # snapshot participant into journal baseline
+        expect { subject }.to change { meeting.journals.count }
+      end
     end
 
     context "when user does not have edit permissions" do
diff --git a/modules/meeting/spec/services/meetings/dispatch_aggregated_notifications_service_spec.rb b/modules/meeting/spec/services/meetings/dispatch_aggregated_notifications_service_spec.rb
new file mode 100644
index 00000000000..4a2e5f4aa23
--- /dev/null
+++ b/modules/meeting/spec/services/meetings/dispatch_aggregated_notifications_service_spec.rb
@@ -0,0 +1,318 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Meetings::DispatchAggregatedNotificationsService do
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:actor) { create(:user, member_with_permissions: { project => %i[view_meetings edit_meetings] }) }
+  shared_let(:existing_user) { create(:user, member_with_permissions: { project => %i[view_meetings] }) }
+  shared_let(:new_user) { create(:user, member_with_permissions: { project => %i[view_meetings] }) }
+  shared_let(:removed_user) { create(:user, member_with_permissions: { project => %i[view_meetings] }) }
+
+  let(:fixed_start_time) { 1.day.from_now.change(usec: 0) }
+  let(:since_journal) { instance_double(Journal, user: actor, data: since_data) }
+  let(:latest_journal) { instance_double(Journal, user: actor, data: latest_data) }
+  let(:since_data) { instance_double(Journal::MeetingJournal, title: "Old Title", location: nil, start_time: fixed_start_time, duration: 1.0) }
+  let(:latest_data) { instance_double(Journal::MeetingJournal, title: "Old Title", location: nil, start_time: fixed_start_time, duration: 1.0) }
+
+  let(:meeting) do
+    create(:meeting, project:, author: actor, notify: true)
+  end
+
+  let(:since_participant_journals) { class_double(Journal::MeetingParticipantJournal) }
+  let(:latest_participant_journals) { class_double(Journal::MeetingParticipantJournal) }
+  let(:mail_delivery) { double(deliver_later: nil) }
+
+  before do
+    allow(since_journal).to receive(:participant_journals).and_return(since_participant_journals) if since_journal
+    allow(latest_journal).to receive(:participant_journals).and_return(latest_participant_journals)
+    allow(since_participant_journals).to receive(:where).with(invited: true).and_return(since_participant_journals)
+    allow(latest_participant_journals).to receive(:where).with(invited: true).and_return(latest_participant_journals)
+
+    allow(Journal::NotificationConfiguration).to receive(:active?).and_return(true)
+    allow(MeetingMailer).to receive_messages(
+      invited: mail_delivery,
+      cancelled: mail_delivery,
+      updated: mail_delivery
+    )
+    allow(MeetingSeriesMailer).to receive_messages(
+      invited: mail_delivery,
+      updated: mail_delivery
+    )
+  end
+
+  subject(:service) do
+    described_class.new(meeting:, since_journal:, latest_journal:).call
+  end
+
+  def stub_invited_ids(journal_double, user_ids)
+    allow(journal_double).to receive(:pluck).with(:user_id).and_return(user_ids)
+  end
+
+  context "when a user is added (not previously invited)" do
+    before do
+      stub_invited_ids(since_participant_journals, [existing_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id, new_user.id])
+    end
+
+    it "sends invite to the newly added user" do
+      service
+      expect(MeetingMailer).to have_received(:invited).with(meeting, new_user, actor)
+    end
+
+    it "sends an updated email with the added participant to the existing user" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:updated)
+        .with(meeting, existing_user, actor,
+              hash_including(added_participants: [new_user.name],
+                             removed_participants: []))
+    end
+
+    it "does not send an updated email to the newly added user" do
+      service
+      expect(MeetingMailer).not_to have_received(:updated).with(meeting, new_user, anything, anything)
+    end
+  end
+
+  context "when a user is removed (was previously invited)" do
+    before do
+      stub_invited_ids(since_participant_journals, [existing_user.id, removed_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id])
+    end
+
+    it "sends cancellation to the removed user" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:cancelled)
+        .with(meeting, removed_user, actor)
+    end
+
+    it "sends an updated email with the removed participant to the still-invited user" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:updated)
+        .with(meeting, existing_user, actor,
+              hash_including(added_participants: [],
+                             removed_participants: [removed_user.name]))
+    end
+  end
+
+  context "when a user is added and another is removed in the same window" do
+    before do
+      stub_invited_ids(since_participant_journals, [existing_user.id, removed_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id, new_user.id])
+    end
+
+    it "sends a single updated email with participant changes to the still-invited user" do
+      service
+      expect(MeetingMailer).to have_received(:updated)
+        .with(meeting, existing_user, actor,
+              hash_including(added_participants: [new_user.name],
+                             removed_participants: [removed_user.name]))
+    end
+  end
+
+  context "when the same user is added and removed within the window (net zero)" do
+    before do
+      stub_invited_ids(since_participant_journals, [existing_user.id, removed_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id, removed_user.id])
+    end
+
+    it "sends no emails" do
+      service
+      expect(MeetingMailer).not_to have_received(:invited)
+      expect(MeetingMailer).not_to have_received(:cancelled)
+      expect(MeetingMailer).not_to have_received(:updated)
+    end
+  end
+
+  context "when meeting attributes change" do
+    let(:new_start_time) { 2.days.from_now }
+
+    before do
+      stub_invited_ids(since_participant_journals, [existing_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id])
+      allow(since_data).to receive(:start_time).and_return(1.day.from_now)
+      allow(latest_data).to receive(:start_time).and_return(new_start_time)
+    end
+
+    it "sends updated email to the still-invited user" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:updated)
+        .with(meeting, existing_user, actor, hash_including(changes: hash_including(:old_start, :new_start)))
+    end
+  end
+
+  context "when explicit since_attributes are provided" do
+    subject(:service) do
+      described_class.new(
+        meeting:,
+        since_journal: nil,
+        latest_journal:,
+        since_invited_ids: [existing_user.id],
+        since_attributes: { "title" => "Old Title", "start_time" => fixed_start_time.iso8601 }
+      ).call
+    end
+
+    before do
+      stub_invited_ids(latest_participant_journals, [existing_user.id])
+      allow(latest_data).to receive(:title).and_return("New Title")
+    end
+
+    it "uses them as the baseline for the updated email" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:updated)
+        .with(meeting, existing_user, actor,
+              hash_including(changes: hash_including(old_title: "Old Title",
+                                                     new_title: "New Title")))
+    end
+  end
+
+  context "when nothing changes" do
+    before do
+      stub_invited_ids(since_participant_journals, [existing_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id])
+    end
+
+    it "sends no emails" do
+      service
+      expect(MeetingMailer).not_to have_received(:invited)
+      expect(MeetingMailer).not_to have_received(:cancelled)
+      expect(MeetingMailer).not_to have_received(:updated)
+    end
+  end
+
+  context "when since_journal is nil" do
+    let(:since_journal) { nil }
+
+    before do
+      stub_invited_ids(latest_participant_journals, [new_user.id])
+    end
+
+    it "treats all latest participants as newly added" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:invited)
+        .with(meeting, new_user, actor)
+    end
+  end
+
+  context "when since_invited_ids is provided explicitly (journal aggregation override)" do
+    subject(:service) do
+      described_class.new(
+        meeting:,
+        since_journal: nil,
+        latest_journal:,
+        since_invited_ids: [existing_user.id]
+      ).call
+    end
+
+    before do
+      stub_invited_ids(latest_participant_journals, [existing_user.id, new_user.id])
+    end
+
+    it "sends invite only to the newly added user (not the existing one)" do
+      service
+      expect(MeetingMailer).to have_received(:invited).with(meeting, new_user, actor)
+      expect(MeetingMailer).not_to have_received(:invited).with(meeting, existing_user, anything)
+    end
+
+    it "sends an updated email with the added participant to the existing user" do
+      service
+      expect(MeetingMailer)
+        .to have_received(:updated)
+        .with(meeting, existing_user, actor,
+              hash_including(added_participants: [new_user.name],
+                             removed_participants: []))
+    end
+  end
+
+  context "when meeting is a series template" do
+    let(:recurring_meeting) { create(:recurring_meeting, project:, author: actor) }
+    let(:meeting) { recurring_meeting.template }
+
+    before do
+      allow(meeting).to receive(:send_emails?).and_return(true)
+      stub_invited_ids(since_participant_journals, [existing_user.id])
+      stub_invited_ids(latest_participant_journals, [existing_user.id, new_user.id])
+    end
+
+    it "sends series invite via MeetingSeriesMailer" do
+      service
+      expect(MeetingSeriesMailer)
+        .to have_received(:invited)
+        .with(recurring_meeting, new_user, actor)
+    end
+
+    it "sends updated via MeetingSeriesMailer with the added participant" do
+      service
+      expect(MeetingSeriesMailer)
+        .to have_received(:updated)
+        .with(recurring_meeting, existing_user, actor,
+              hash_including(added_participants: [new_user.name],
+                             removed_participants: []))
+    end
+
+    it "does not send meeting attribute changes via MeetingSeriesMailer" do
+      service
+      expect(MeetingSeriesMailer)
+        .to have_received(:updated)
+        .with(recurring_meeting, existing_user, actor,
+              hash_including(changes: { old_schedule: recurring_meeting.full_schedule_in_words,
+                                        old_location: nil }))
+    end
+  end
+
+  context "when Journal::NotificationConfiguration is inactive" do
+    before do
+      allow(Journal::NotificationConfiguration).to receive(:active?).and_return(false)
+    end
+
+    it "sends no emails" do
+      service
+      expect(MeetingMailer).not_to have_received(:invited)
+    end
+  end
+
+  context "when meeting cannot send emails" do
+    before do
+      allow(meeting).to receive(:send_emails?).and_return(false)
+    end
+
+    it "sends no emails" do
+      service
+      expect(MeetingMailer).not_to have_received(:invited)
+    end
+  end
+end
diff --git a/modules/meeting/spec/workers/meetings/notification_debounce_job_spec.rb b/modules/meeting/spec/workers/meetings/notification_debounce_job_spec.rb
new file mode 100644
index 00000000000..fcbc39e426c
--- /dev/null
+++ b/modules/meeting/spec/workers/meetings/notification_debounce_job_spec.rb
@@ -0,0 +1,183 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Meetings::NotificationDebounceJob do
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings edit_meetings] }) }
+  shared_let(:meeting) { create(:meeting, project:, author: user, notify: true) }
+
+  let(:dispatch_service) { instance_double(Meetings::DispatchAggregatedNotificationsService) }
+
+  before do
+    allow(Meetings::DispatchAggregatedNotificationsService)
+      .to receive(:new)
+            .and_return(dispatch_service)
+    allow(dispatch_service).to receive(:call)
+  end
+
+  describe ".debounce" do
+    it "enqueues a background job" do
+      expect { described_class.debounce(meeting) }
+        .to have_enqueued_job(described_class)
+              .with(meeting.id, anything, anything, anything)
+    end
+
+    it "does not call the dispatch service synchronously" do
+      described_class.debounce(meeting)
+      expect(dispatch_service).not_to have_received(:call)
+    end
+
+    context "when querying GoodJob directly",
+            with_good_job: described_class do
+      it "writes the job to the GoodJob::Job table with the correct concurrency key" do
+        described_class.debounce(meeting)
+
+        job = GoodJob::Job.where(concurrency_key: described_class.unique_key_for(meeting.id)).first
+        expect(job).not_to be_nil
+        expect(job.serialized_params.dig("arguments", 0)).to eq(meeting.id)
+      end
+
+      it "passes nil since_journal_id when meeting journal has no predecessor" do
+        described_class.debounce(meeting)
+
+        job = GoodJob::Job.where(concurrency_key: described_class.unique_key_for(meeting.id)).first
+        expect(job.serialized_params.dig("arguments", 1)).to be_nil
+      end
+
+      context "when called multiple times (debounce reset)" do
+        before { described_class.debounce(meeting) }
+
+        it "leaves only one pending job" do
+          described_class.debounce(meeting)
+
+          count = GoodJob::Job.where(finished_at: nil, concurrency_key: described_class.unique_key_for(meeting.id)).count
+          expect(count).to eq(1)
+        end
+
+        it "preserves the since_journal_id from the first call" do
+          first_since_id = GoodJob::Job.where(concurrency_key: described_class.unique_key_for(meeting.id))
+                                       .first
+                                       .serialized_params
+                                       .dig("arguments", 1)
+
+          described_class.debounce(meeting)
+
+          job = GoodJob::Job.where(finished_at: nil, concurrency_key: described_class.unique_key_for(meeting.id)).first
+          expect(job.serialized_params.dig("arguments", 1)).to eq(first_since_id)
+        end
+
+        it "preserves explicit since_attributes from the first call" do
+          described_class.debounce(meeting, since_attributes: { "title" => "Initial title" })
+          described_class.debounce(meeting, since_attributes: { "title" => "Later title" })
+
+          job = GoodJob::Job.where(finished_at: nil, concurrency_key: described_class.unique_key_for(meeting.id)).first
+          expect(job.serialized_params.dig("arguments", 3, "title")).to eq("Initial title")
+        end
+      end
+    end
+  end
+
+  describe ".cancel_pending", with_good_job: described_class do
+    before do
+      described_class.debounce(meeting)
+    end
+
+    it "removes pending jobs for the meeting" do
+      expect do
+        described_class.cancel_pending(meeting)
+      end.to change {
+        GoodJob::Job.where(finished_at: nil, concurrency_key: described_class.unique_key_for(meeting.id)).count
+      }.from(1).to(0)
+    end
+  end
+
+  describe "#perform" do
+    let(:since_journal) { meeting.last_journal }
+    let(:latest_journal) { instance_double(Journal, id: since_journal.id + 1, user: user) }
+
+    before do
+      allow(meeting.class).to receive(:find_by).with(id: meeting.id).and_return(meeting)
+      allow(Journal).to receive(:find_by).with(id: since_journal.id).and_return(since_journal)
+      allow(meeting).to receive(:last_journal).and_return(latest_journal)
+    end
+
+    subject { described_class.new.perform(meeting.id, since_journal.id) }
+
+    it "calls the dispatch service with the correct journals" do
+      subject
+      expect(Meetings::DispatchAggregatedNotificationsService)
+        .to have_received(:new)
+              .with(meeting:,
+                    since_journal:,
+                    latest_journal:,
+                    since_invited_ids: nil,
+                    since_attributes: nil)
+      expect(dispatch_service).to have_received(:call)
+    end
+
+    context "when meeting does not exist" do
+      before { allow(meeting.class).to receive(:find_by).with(id: meeting.id).and_return(nil) }
+
+      it "does nothing" do
+        subject
+        expect(dispatch_service).not_to have_received(:call)
+      end
+    end
+
+    context "when meeting cannot send emails" do
+      before { allow(meeting).to receive(:send_emails?).and_return(false) }
+
+      it "does nothing" do
+        subject
+        expect(dispatch_service).not_to have_received(:call)
+      end
+    end
+
+    context "when latest journal equals since_journal_id (no change)" do
+      before { allow(meeting).to receive(:last_journal).and_return(since_journal) }
+
+      it "does nothing" do
+        subject
+        expect(dispatch_service).not_to have_received(:call)
+      end
+    end
+
+    context "when there is no latest journal" do
+      before { allow(meeting).to receive(:last_journal).and_return(nil) }
+
+      it "does nothing" do
+        subject
+        expect(dispatch_service).not_to have_received(:call)
+      end
+    end
+  end
+end
diff --git a/modules/my_page/config/locales/crowdin/hy.yml b/modules/my_page/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..22be60fa28c
--- /dev/null
+++ b/modules/my_page/config/locales/crowdin/hy.yml
@@ -0,0 +1,4 @@
+---
+hy:
+  my_page:
+    label: My page
diff --git a/modules/openid_connect/config/locales/crowdin/hy.yml b/modules/openid_connect/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..c3078a89ccc
--- /dev/null
+++ b/modules/openid_connect/config/locales/crowdin/hy.yml
@@ -0,0 +1,166 @@
+---
+hy:
+  plugin_openproject_openid_connect:
+    name: OpenProject OpenID Connect
+    description: Adds OmniAuth OpenID Connect strategy providers to OpenProject.
+  logout_warning: 'You have been logged out. The contents of any form you submit may be lost. Please [log in].
+
+    '
+  activerecord:
+    attributes:
+      openid_connect/group_link:
+        oidc_group_name: OpenID group identifier
+      openid_connect/provider:
+        name: Name
+        slug: Unique identifier
+        display_name: Display name
+        client_id: Client ID
+        client_secret: Client secret
+        groups_claim: Groups claim
+        group_regexes: Patterns (regular expressions)
+        secret: Secret
+        scope: Scope
+        sync_groups: Synchronize groups
+        grant_types_supported: Supported grant types
+        limit_self_registration: Limit self registration
+        authorization_endpoint: Authorization endpoint
+        userinfo_endpoint: User information endpoint
+        token_endpoint: Token endpoint
+        end_session_endpoint: End session endpoint
+        post_logout_redirect_uri: Post logout redirect URI
+        jwks_uri: JWKS URI
+        issuer: Issuer
+        tenant: Tenant
+        metadata_url: Metadata URL
+        icon: Custom icon
+        claims: Claims
+        acr_values: ACR values
+        redirect_url: Redirect URL
+    errors:
+      models:
+        openid_connect/provider:
+          attributes:
+            metadata_url:
+              format: Discovery endpoint URL %{message}
+              response_is_not_successful: " responds with %{status}."
+              response_is_not_json: " does not return JSON body."
+              response_misses_required_attributes: " does not return required attributes. Missing attributes are: %{missing_attributes}."
+          invalid_claims_essential: does not define a boolean at %{attribute}.
+          invalid_claims_location: 'contain unsupported locations: %{invalid}. Supported locations are: %{supported}.'
+          invalid_claims_values: does not define an array at %{attribute}.
+          non_object_attribute: does not define a JSON object at %{attribute}.
+  provider:
+    delete_warning:
+      input_delete_confirmation_html: Enter the provider name %{name} to confirm deletion.
+      irreversible_notice: Deleting an SSO provider is an irreversible action.
+      provider_html: 'Are you sure you want to delete the SSO provider %{name}? Be aware, that this will:'
+      delete_result_1: Remove the provider from the list of available providers.
+      delete_result_user_count:
+        zero: No users are currently using this provider. No further action is required.
+        one: One user is currently still using this provider. They will need to be re-invited or logging in with another provider.
+        other: "%{count} users are currently still using this provider. They will need to be re-invited or logging in with another provider."
+      delete_result_direct: This provider is marked as a direct login provider. The setting will be removed and users will no longer be redirected to the provider for login.
+  openid_connect:
+    menu_title: OpenID providers
+    delete_title: Delete OpenID Connect provider
+    delete_heading: Delete this OpenID Connect provider?
+    group_links_heading: OpenID Connect group links
+    groups:
+      match_preview_component:
+        title: Extracted group names
+        placeholder_none: No groups currently match the pattern.
+      match_preview_dialog_component:
+        description: This allows you to test your regular expression pattern against sample data to verify that the group names you want extracted are indeed extracted properly. You can modify your pattern here but the test string and matches themselves will not be saved with the configuration.
+        group_names_label: Test group names
+        group_names_description: Enter one group name per line as it would appear in the OIDC claim, to see how your regular expression patterns affect them.
+        show_button: Test pattern
+        title: Test regular expressions
+    instructions:
+      endpoint_url: The endpoint URL given to you by the OpenID Connect provider
+      group_regexes: One regular expression pattern per line. Please read [the documentation](docs_url) for more information on how to do this.
+      group_regexes_detail: Optionally define patterns using regular expressions to match group names from the groups claim. For example, entering a pattern like <code>^Level1/Level2/([\w/]+)$</code> will extract the group “Groupname/SubGroup” from a response including “Level1/Level2/GroupName/SubGroup”. If no pattern matches, the group is ignored. Leave empty to synchronize all groups using their full group name.
+      group_regexes_testing: Click on 'Test pattern' to test your regular expression pattern against sample OIDC userinfo.
+      group_sync: Automatically extract and synchronise group membership information from the identity provider.
+      groups_claim: Specify the name of the claim that's expected to indicate the group names that the user is a member of.
+      metadata_none: I don't have this information
+      metadata_url: I have a discovery endpoint URL
+      oidc_information: These values are needed to configure the OpenID Connect provider.
+      client_id: This is the client ID given to you by your OpenID Connect provider
+      client_secret: This is the client secret given to you by your OpenID Connect provider
+      limit_self_registration: If enabled, users can only register using this provider if configuration on the provider's end allows it.
+      display_name: The name of the provider. This will be displayed as the login button and in the list of providers.
+      tenant: Please replace the default tenant with your own if applicable. See <a href=" https://learn.microsoft.com/en-us/entra/identity-platform/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri">this</a>.
+      scope: If you want to request custom scopes, you can add one or multiple scope values separated by spaces here. For more information, see the [OpenID Connect documentation](docs_url).
+      post_logout_redirect_uri: The URL the OpenID Connect provider should redirect to after a logout request.
+      claims: 'You can request additional claims for the userinfo and id token endpoints. Please see [our OpenID connect documentation](docs_url) for more information.
+
+        '
+      acr_values: 'Request non-essential claims in an easier format. See [our documentation on acr_values](docs_url) for more information.
+
+        '
+      mapping_login: 'Provide a custom mapping in the userinfo response to be used for the login attribute.
+
+        '
+      mapping_email: 'Provide a custom mapping in the userinfo response to be used for the email attribute.
+
+        '
+      mapping_first_name: 'Provide a custom mapping in the userinfo response to be used for the first name.
+
+        '
+      mapping_last_name: 'Provide a custom mapping in the userinfo response to be used for the last name.
+
+        '
+      mapping_admin: 'Provide a custom mapping in the userinfo response to be used for the admin status. It expects a boolean attribute to be returned.
+
+        '
+    settings:
+      metadata_none: I don't have this information
+      metadata_url: I have a discovery endpoint URL
+      endpoint_url: Endpoint URL
+    providers:
+      label_providers: Providers
+      seeded_from_env: This provider was seeded from the environment configuration. It cannot be edited.
+      google:
+        name: Google
+      microsoft_entra:
+        name: Microsoft Entra
+      custom:
+        name: Custom
+      upsell:
+        title: Single Sign-On (SSO) with OpenID connect
+        description: Connect OpenProject to an OpenID connect identity provider
+      label_add_new: Add a new OpenID provider
+      label_edit: Edit OpenID provider %{name}
+      label_empty_title: No OpenID providers configured yet.
+      label_empty_description: Add a provider to see them here.
+      label_group_mapping: Group mapping
+      label_metadata: OpenID Connect Discovery Endpoint
+      label_automatic_configuration: Automatic configuration
+      label_optional_configuration: Optional configuration
+      label_advanced_configuration: Advanced configuration
+      label_configuration_details: Metadata
+      label_client_details: Client details
+      label_attribute_mapping: Attribute mapping
+      notice_created: A new OpenID provider was successfully created.
+      client_details_description: Configuration details of OpenProject as an OIDC client
+      no_results_table: No providers have been defined yet.
+      plural: OpenID providers
+      singular: OpenID provider
+      section_texts:
+        group_mapping: Map group names provided by the identity provider to groups in OpenProject.
+        metadata: Pre-fill configuration using an OpenID Connect discovery endpoint URL
+        metadata_form_banner: Editing the discovery endpoint may override existing pre-filled metadata values.
+        metadata_form_title: OpenID Connect Discovery endpoint
+        metadata_form_description: If your identity provider has a discovery endpoint URL. Use it below to pre-fill configuration.
+        configuration_metadata: The information has been pre-filled using the supplied discovery endpoint. In most cases, they do not require editing.
+        configuration: Configuration details of the OpenID Connect provider
+        display_name: The display name visible to users.
+        attribute_mapping: Configure the mapping of attributes between OpenProject and the OpenID Connect provider.
+        claims: Request additional claims for the ID token or userinfo response.
+      side_panel:
+        information_component:
+          backchannel_logout_url: Backchannel logout URL
+    setting_instructions:
+      limit_self_registration: 'If enabled users can only register using this provider if the self registration setting allows for it.
+
+        '
diff --git a/modules/overviews/config/locales/crowdin/hy.yml b/modules/overviews/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..e8544ae1a6a
--- /dev/null
+++ b/modules/overviews/config/locales/crowdin/hy.yml
@@ -0,0 +1,6 @@
+---
+hy:
+  overviews:
+    label_home: "%{workspace_type} home"
+    label_dashboard: Dashboard
+    label_overview: Overview
diff --git a/modules/overviews/config/locales/crowdin/js-hy.yml b/modules/overviews/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..6fd81f2d82f
--- /dev/null
+++ b/modules/overviews/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,5 @@
+---
+hy:
+  js:
+    overviews:
+      label: Overview
diff --git a/modules/recaptcha/config/locales/crowdin/da.yml b/modules/recaptcha/config/locales/crowdin/da.yml
index 93fe725381c..6e2de691476 100644
--- a/modules/recaptcha/config/locales/crowdin/da.yml
+++ b/modules/recaptcha/config/locales/crowdin/da.yml
@@ -6,7 +6,7 @@ da:
     description: This module provides recaptcha checks during login.
   recaptcha:
     label_recaptcha: reCAPTCHA
-    button_please_wait: Please wait ...
+    button_please_wait: Vent venligst ...
     verify_account: Verify your account
     error_captcha: Your account could not be verified. Please contact an administrator.
     settings:
@@ -14,10 +14,10 @@ da:
       response_limit: Response limit for HCaptcha
       response_limit_text: The maximum number of characters to treat the HCaptcha response as valid.
       website_key_text: Enter the website key you created on the reCAPTCHA admin console for this domain.
-      secret_key: Secret key
+      secret_key: Hemmelig nøgle
       secret_key_text: Enter the secret key you created on the reCAPTCHA admin console.
-      type: Use reCAPTCHA
-      type_disabled: Disable reCAPTCHA
+      type: Brug reCAPTCHA
+      type_disabled: Deaktiver reCAPTCHA
       type_v2: reCAPTCHA v2
       type_v3: reCAPTCHA v3
       type_hcaptcha: HCaptcha
diff --git a/modules/recaptcha/config/locales/crowdin/hy.yml b/modules/recaptcha/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..f578b171fc4
--- /dev/null
+++ b/modules/recaptcha/config/locales/crowdin/hy.yml
@@ -0,0 +1,27 @@
+#English strings go here for Rails i18n
+---
+hy:
+  plugin_openproject_recaptcha:
+    name: OpenProject ReCaptcha
+    description: This module provides recaptcha checks during login.
+  recaptcha:
+    label_recaptcha: reCAPTCHA
+    button_please_wait: Please wait ...
+    verify_account: Verify your account
+    error_captcha: Your account could not be verified. Please contact an administrator.
+    settings:
+      website_key: Website key (May also be called "Site key")
+      response_limit: Response limit for HCaptcha
+      response_limit_text: The maximum number of characters to treat the HCaptcha response as valid.
+      website_key_text: Enter the website key you created on the reCAPTCHA admin console for this domain.
+      secret_key: Secret key
+      secret_key_text: Enter the secret key you created on the reCAPTCHA admin console.
+      type: Use reCAPTCHA
+      type_disabled: Disable reCAPTCHA
+      type_v2: reCAPTCHA v2
+      type_v3: reCAPTCHA v3
+      type_hcaptcha: HCaptcha
+      type_turnstile: Cloudflare Turnstile™
+      captcha_description_html: 'reCAPTCHA is a free service by Google that can be enabled for your OpenProject instance. If enabled, a captcha form will be rendered upon login for all users that have not verified a captcha yet. <br/> Please see the following link for more details on reCAPTCHA and their versions, and how to create the website and secret keys: %{recaptcha_link} <br/> HCaptcha is a Google-free alternative that you can use if you do not want to use reCAPTCHA. See this link for more information: %{hcaptcha_link} <br/> Cloudflare Turnstile™ is another alternative that is more convenient for users while still providing the same level of security. See this link for more information: %{turnstile_link}
+
+        '
diff --git a/modules/reporting/app/models/cost_query/filter/work_package_id.rb b/modules/reporting/app/models/cost_query/filter/work_package_id.rb
index 2a899f9a4dd..e4104f0f1fb 100644
--- a/modules/reporting/app/models/cost_query/filter/work_package_id.rb
+++ b/modules/reporting/app/models/cost_query/filter/work_package_id.rb
@@ -47,7 +47,7 @@ class CostQuery::Filter::WorkPackageId < Report::Filter::Base
   # Overwrites Report::Filter::Base self.label_for_value method
   # to achieve a more performant implementation
   def self.label_for_value(value)
-    return nil unless value.to_i.to_s == value.to_s # we expect an work_package-id
+    return nil unless WorkPackage::SemanticIdentifier.numeric_id?(value.to_s)
 
     work_package = WorkPackage.visible.find(value.to_i)
     [text_for_work_package(work_package), work_package.id] if work_package&.visible?(User.current)
diff --git a/modules/reporting/config/locales/crowdin/hy.yml b/modules/reporting/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..cf8732ab880
--- /dev/null
+++ b/modules/reporting/config/locales/crowdin/hy.yml
@@ -0,0 +1,107 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  plugin_openproject_reporting:
+    name: OpenProject Reporting
+    description: This plugin allows creating custom cost reports with filtering and grouping created by the OpenProject Time and costs plugin.
+  button_save_report_as: Save report as...
+  comments: Comment
+  cost_reports_title: Time and costs
+  label_cost_report: Cost report
+  label_cost_report_plural: Cost reports
+  description_drill_down: Show details
+  description_filter_selection: Selection
+  description_multi_select: Show multiselect
+  description_remove_filter: Remove filter
+  information_restricted_depending_on_permission: Depending on your permissions this page might contain restricted information.
+  label_click_to_edit: Click to edit.
+  label_closed: closed
+  label_columns: Columns
+  label_cost_entry_attributes: Cost entry attributes
+  label_days_ago: during the last days
+  label_entry: Cost entry
+  label_filter_text: Filter text
+  label_filter_value: Value
+  label_filters: Filter
+  label_greater: ">"
+  label_is_not_project_with_subprojects: is not (includes subprojects)
+  label_is_project_with_subprojects: is (includes subprojects)
+  label_is_work_package_with_descendants: is (includes descendants)
+  label_is_not_work_package_with_descendants: is not (includes descendants)
+  label_work_package_attributes: Work package attributes
+  label_less: "<"
+  label_logged_by_reporting: Logged by
+  label_money: Cash value
+  label_month_reporting: Month (Spent)
+  label_new_report: New cost report
+  label_open: open
+  label_operator: Operator
+  label_private_report_plural: Private cost reports
+  label_progress_bar_explanation: Generating report...
+  label_public_report_plural: Public cost reports
+  label_really_delete_question: Are you sure you want to delete this report?
+  label_rows: Rows
+  label_saving: Saving ...
+  label_spent_on_reporting: Date (Spent)
+  label_sum: Sum
+  label_units: Units
+  label_week_reporting: Week (Spent)
+  label_year_reporting: Year (Spent)
+  label_count: Count
+  label_filter: Filter
+  label_filter_add: Add Filter
+  label_filter_plural: Filters
+  label_group_by: Group by
+  label_group_by_add: Add Group-by Attribute
+  label_inactive: "«inactive»"
+  label_no: 'No'
+  label_none: "(no data)"
+  label_no_reports: There are no cost reports yet.
+  label_report: Report
+  label_yes: 'Yes'
+  load_query_question: Report will have %{size} table cells and may take some time to render. Do you still want to try rendering it?
+  permission_save_cost_reports: Save public cost reports
+  permission_save_private_cost_reports: Save private cost reports
+  project_module_reporting_module: Cost reports
+  text_costs_are_rounded_note: Displayed values are rounded. All calculations are based on the non-rounded values.
+  toggle_multiselect: activate/deactivate multiselect
+  units: Units
+  validation_failure_date: is not a valid date
+  validation_failure_integer: is not a valid integer
+  export:
+    timesheet:
+      title: Your PDF timesheet export
+      button: Export PDF timesheet
+      timesheet: Timesheet
+      time: Time
+      sums_hours: Sums
+      overview_per_user_total: 'Overview: Total hours per user'
+      overview_per_user_day: 'Overview: Hours per user per day'
+    cost_reports:
+      title: Your Cost Reports XLS export
+      start_time: Start time
+      end_time: End time
+  reporting:
+    group_by:
+      selected_columns: Selected columns
+      selected_rows: Selected rows
diff --git a/modules/reporting/config/locales/crowdin/js-hy.yml b/modules/reporting/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..ef8d8fc083c
--- /dev/null
+++ b/modules/reporting/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,27 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    reporting_engine:
+      label_remove: Delete
+      label_response_error: There was an error handling the query.
diff --git a/modules/reporting/spec/requests/custom_field_cache_spec.rb b/modules/reporting/spec/requests/custom_field_cache_spec.rb
index e92b5c5b6e2..a300f29bf18 100644
--- a/modules/reporting/spec/requests/custom_field_cache_spec.rb
+++ b/modules/reporting/spec/requests/custom_field_cache_spec.rb
@@ -69,7 +69,6 @@ RSpec.describe "Custom field filter and group by caching" do
 
   def visit_cost_reports_index
     header "Content-Type", "text/html"
-    header "X-Requested-With", "XMLHttpRequest"
     get "/projects/#{project.id}/cost_reports"
   end
 
diff --git a/spec/components/open_project/common/work_package_card_list_component/empty_item_spec.rb b/modules/resource_management/app/contracts/resource_allocations/base_contract.rb
similarity index 65%
rename from spec/components/open_project/common/work_package_card_list_component/empty_item_spec.rb
rename to modules/resource_management/app/contracts/resource_allocations/base_contract.rb
index 0995b5d41a6..0b0faf8efab 100644
--- a/spec/components/open_project/common/work_package_card_list_component/empty_item_spec.rb
+++ b/modules/resource_management/app/contracts/resource_allocations/base_contract.rb
@@ -28,28 +28,28 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "rails_helper"
-
-RSpec.describe OpenProject::Common::WorkPackageCardListComponent::EmptyItem, type: :component do
-  describe "#row_args" do
-    it "marks the row as an empty list item by default" do
-      item = described_class.new
-
-      expect(item.row_args[:data]).to include(empty_list_item: true)
+module ResourceAllocations
+  class BaseContract < ::ModelContract
+    def self.model
+      ResourceAllocation
     end
 
-    it "lets caller-supplied data override the default empty item data" do
-      item = described_class.new(
-        data: {
-          empty_list_item: false,
-          test_selector: "custom-empty-row"
-        }
-      )
+    attribute :principal
+    attribute :state
+    attribute :start_date
+    attribute :end_date
+    attribute :allocated_time
+    attribute :user_filter
 
-      expect(item.row_args[:data]).to include(
-        empty_list_item: false,
-        test_selector: "custom-empty-row"
-      )
+    validate :user_allowed_to_allocate
+
+    private
+
+    def user_allowed_to_allocate
+      return if model.project.nil?
+      return if user.allowed_in_project?(:allocate_user_resources, model.project)
+
+      errors.add :base, :error_unauthorized
     end
   end
 end
diff --git a/modules/resource_management/app/contracts/resource_allocations/create_contract.rb b/modules/resource_management/app/contracts/resource_allocations/create_contract.rb
new file mode 100644
index 00000000000..a1f22597117
--- /dev/null
+++ b/modules/resource_management/app/contracts/resource_allocations/create_contract.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class CreateContract < BaseContract
+    # `entity` is set on creation, then immutable.
+    attribute :entity
+    attribute :entity_type
+    attribute :entity_id
+  end
+end
diff --git a/modules/resource_management/app/contracts/resource_allocations/delete_contract.rb b/modules/resource_management/app/contracts/resource_allocations/delete_contract.rb
new file mode 100644
index 00000000000..d813f4cc4d1
--- /dev/null
+++ b/modules/resource_management/app/contracts/resource_allocations/delete_contract.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class DeleteContract < ::DeleteContract
+    delete_permission :allocate_user_resources
+  end
+end
diff --git a/modules/resource_management/app/contracts/resource_allocations/update_contract.rb b/modules/resource_management/app/contracts/resource_allocations/update_contract.rb
new file mode 100644
index 00000000000..e97448637e7
--- /dev/null
+++ b/modules/resource_management/app/contracts/resource_allocations/update_contract.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class UpdateContract < BaseContract
+  end
+end
diff --git a/modules/resource_management/app/contracts/resource_planners/base_contract.rb b/modules/resource_management/app/contracts/resource_planners/base_contract.rb
index 7308e50e3f6..f3e404a4a1b 100644
--- a/modules/resource_management/app/contracts/resource_planners/base_contract.rb
+++ b/modules/resource_management/app/contracts/resource_planners/base_contract.rb
@@ -36,12 +36,8 @@ module ResourcePlanners
 
     attribute :name
 
-    attribute :options, writable: -> do
-      model.options_change&.none? { it.except("start_date", "end_date").any? }
-    end
-
-    attribute :start_date
-    attribute :end_date
+    stored_attribute :start_date, store: :options
+    stored_attribute :end_date, store: :options
 
     validate :user_allowed_to_manage
 
diff --git a/modules/resource_management/app/models/resource_allocation.rb b/modules/resource_management/app/models/resource_allocation.rb
new file mode 100644
index 00000000000..f5174116280
--- /dev/null
+++ b/modules/resource_management/app/models/resource_allocation.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class ResourceAllocation < ApplicationRecord
+  belongs_to :entity, polymorphic: true, optional: false
+  belongs_to :principal, class_name: "User", optional: true, inverse_of: :resource_allocations
+
+  serialize :user_filter, coder: Queries::Serialization::Filters.new(UserQuery)
+
+  enum :state, {
+    requested: "requested",
+    allocated: "allocated",
+    rejected: "rejected",
+    canceled: "canceled"
+  }
+
+  validates :state, :start_date, :end_date, presence: true
+  validates :allocated_time,
+            presence: true,
+            numericality: { only_integer: true, greater_than: 0 }
+
+  validate :end_date_after_start_date
+
+  # Resource allocations are scoped to whatever project their (polymorphic)
+  # entity belongs to. Authorization in the contracts hangs off this.
+  def project
+    entity&.project
+  end
+
+  private
+
+  def end_date_after_start_date
+    return if start_date.blank? || end_date.blank?
+    return if end_date > start_date
+
+    errors.add :end_date, :greater_than_start_date
+  end
+end
diff --git a/modules/resource_management/app/services/resource_allocations/create_service.rb b/modules/resource_management/app/services/resource_allocations/create_service.rb
new file mode 100644
index 00000000000..8f3b4ba179e
--- /dev/null
+++ b/modules/resource_management/app/services/resource_allocations/create_service.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class CreateService < ::BaseServices::Create
+  end
+end
diff --git a/modules/resource_management/app/services/resource_allocations/delete_service.rb b/modules/resource_management/app/services/resource_allocations/delete_service.rb
new file mode 100644
index 00000000000..ddc18c8307c
--- /dev/null
+++ b/modules/resource_management/app/services/resource_allocations/delete_service.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class DeleteService < ::BaseServices::Delete
+  end
+end
diff --git a/modules/resource_management/app/services/resource_allocations/set_attributes_service.rb b/modules/resource_management/app/services/resource_allocations/set_attributes_service.rb
new file mode 100644
index 00000000000..327d1064f50
--- /dev/null
+++ b/modules/resource_management/app/services/resource_allocations/set_attributes_service.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class SetAttributesService < ::BaseServices::SetAttributes
+    private
+
+    def set_default_attributes(_params)
+      model.change_by_system do
+        model.state ||= "requested"
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/services/resource_allocations/update_service.rb b/modules/resource_management/app/services/resource_allocations/update_service.rb
new file mode 100644
index 00000000000..2a80911a719
--- /dev/null
+++ b/modules/resource_management/app/services/resource_allocations/update_service.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ResourceAllocations
+  class UpdateService < ::BaseServices::Update
+  end
+end
diff --git a/modules/resource_management/config/locales/crowdin/af.yml b/modules/resource_management/config/locales/crowdin/af.yml
index 51f64814770..7ef34709854 100644
--- a/modules/resource_management/config/locales/crowdin/af.yml
+++ b/modules/resource_management/config/locales/crowdin/af.yml
@@ -9,12 +9,24 @@ af:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ af:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ar.yml b/modules/resource_management/config/locales/crowdin/ar.yml
index cfa1bdbb6a5..9bf494f0c9e 100644
--- a/modules/resource_management/config/locales/crowdin/ar.yml
+++ b/modules/resource_management/config/locales/crowdin/ar.yml
@@ -9,12 +9,24 @@ ar:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ar:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/az.yml b/modules/resource_management/config/locales/crowdin/az.yml
index 4210e044b5e..00e59557e55 100644
--- a/modules/resource_management/config/locales/crowdin/az.yml
+++ b/modules/resource_management/config/locales/crowdin/az.yml
@@ -9,12 +9,24 @@ az:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ az:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/be.yml b/modules/resource_management/config/locales/crowdin/be.yml
index 39263190c0d..3b4722ecde6 100644
--- a/modules/resource_management/config/locales/crowdin/be.yml
+++ b/modules/resource_management/config/locales/crowdin/be.yml
@@ -9,12 +9,24 @@ be:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ be:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/bg.yml b/modules/resource_management/config/locales/crowdin/bg.yml
index 39392cf2024..2fda2d4e89d 100644
--- a/modules/resource_management/config/locales/crowdin/bg.yml
+++ b/modules/resource_management/config/locales/crowdin/bg.yml
@@ -9,12 +9,24 @@ bg:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ bg:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ca.yml b/modules/resource_management/config/locales/crowdin/ca.yml
index 5c766e1ca8f..8b7f21c87f8 100644
--- a/modules/resource_management/config/locales/crowdin/ca.yml
+++ b/modules/resource_management/config/locales/crowdin/ca.yml
@@ -9,12 +9,24 @@ ca:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ca:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ckb-IR.yml b/modules/resource_management/config/locales/crowdin/ckb-IR.yml
index 3ed7702a952..8d3518d5b51 100644
--- a/modules/resource_management/config/locales/crowdin/ckb-IR.yml
+++ b/modules/resource_management/config/locales/crowdin/ckb-IR.yml
@@ -9,12 +9,24 @@ ckb-IR:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ckb-IR:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/cs.yml b/modules/resource_management/config/locales/crowdin/cs.yml
index 2e9482512f9..a1e875e1417 100644
--- a/modules/resource_management/config/locales/crowdin/cs.yml
+++ b/modules/resource_management/config/locales/crowdin/cs.yml
@@ -9,12 +9,24 @@ cs:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ cs:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/da.yml b/modules/resource_management/config/locales/crowdin/da.yml
index e83a46b8b50..83cf3e3c6c7 100644
--- a/modules/resource_management/config/locales/crowdin/da.yml
+++ b/modules/resource_management/config/locales/crowdin/da.yml
@@ -9,12 +9,24 @@ da:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ da:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/de.yml b/modules/resource_management/config/locales/crowdin/de.yml
index bd0332b9e1c..bc7a7b91de0 100644
--- a/modules/resource_management/config/locales/crowdin/de.yml
+++ b/modules/resource_management/config/locales/crowdin/de.yml
@@ -9,12 +9,24 @@ de:
         default_view_class_name: Standardansicht
         public: Öffentlich
         favorite: Favorit
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: muss nach dem Anfangstermin liegen.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Ressourcenmanagement
     description: Bietet Ressourcenmanagement und Kapazitätsplanung.
@@ -26,6 +38,10 @@ de:
   permission_manage_public_resource_planners: Öffentliche Ressourcenplaner verwalten
   permission_manage_public_resource_planners_explanation: 'Ermöglicht Benutzern das Erstellen und Verwalten von öffentlichen Ressourcenplanern. Sie können damit ihre eigenen Ressourcenplaner anzeigen, erstellen, verwalten und veröffentlichen. Es erlaubt Benutzern nicht, die von anderen Benutzern erstellten Ressourcenplaner, die nicht öffentlich freigegeben sind, einzusehen.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Ressourcenplanung
   button_next: Speichern
@@ -40,7 +56,7 @@ de:
 
       '
     view_types:
-      UserCardView: Users cards
+      UserCardView: Benutzer-Karten
     action:
       favorite: Zu Favoriten hinzufügen
       unfavorite: Aus Favoriten entfernen
diff --git a/modules/resource_management/config/locales/crowdin/el.yml b/modules/resource_management/config/locales/crowdin/el.yml
index 5c25c2b6a4d..c52de9a4161 100644
--- a/modules/resource_management/config/locales/crowdin/el.yml
+++ b/modules/resource_management/config/locales/crowdin/el.yml
@@ -9,12 +9,24 @@ el:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ el:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/eo.yml b/modules/resource_management/config/locales/crowdin/eo.yml
index 072dceee71b..ce10dbc3e60 100644
--- a/modules/resource_management/config/locales/crowdin/eo.yml
+++ b/modules/resource_management/config/locales/crowdin/eo.yml
@@ -9,12 +9,24 @@ eo:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ eo:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/es.yml b/modules/resource_management/config/locales/crowdin/es.yml
index 9fa7b05b37a..4789cb3cf04 100644
--- a/modules/resource_management/config/locales/crowdin/es.yml
+++ b/modules/resource_management/config/locales/crowdin/es.yml
@@ -9,12 +9,24 @@ es:
         default_view_class_name: Vista por defecto
         public: Público
         favorite: Favorito
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: debe ser posterior a la fecha de inicio.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: Gestión de recursos de OpenProject
     description: Proporciona gestión de recursos y planificación de capacidades.
@@ -26,6 +38,10 @@ es:
   permission_manage_public_resource_planners: Gestionar los planificadores de recursos públicos
   permission_manage_public_resource_planners_explanation: 'Permite a los usuarios crear y gestionar planificadores de recursos públicos. Les permite ver, crear, gestionar y publicar sus propios planificadores de recursos. No permite a los usuarios ver los planificadores de recursos creados por otros usuarios que no se hayan compartido públicamente.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Planificación de recursos
   button_next: Guardar
diff --git a/modules/resource_management/config/locales/crowdin/et.yml b/modules/resource_management/config/locales/crowdin/et.yml
index 99f38ab5adf..8832dbf1b29 100644
--- a/modules/resource_management/config/locales/crowdin/et.yml
+++ b/modules/resource_management/config/locales/crowdin/et.yml
@@ -9,12 +9,24 @@ et:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ et:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/eu.yml b/modules/resource_management/config/locales/crowdin/eu.yml
index b6b90fbe153..ab94920401f 100644
--- a/modules/resource_management/config/locales/crowdin/eu.yml
+++ b/modules/resource_management/config/locales/crowdin/eu.yml
@@ -9,12 +9,24 @@ eu:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ eu:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/fa.yml b/modules/resource_management/config/locales/crowdin/fa.yml
index 76678f7b990..7c0ff80c832 100644
--- a/modules/resource_management/config/locales/crowdin/fa.yml
+++ b/modules/resource_management/config/locales/crowdin/fa.yml
@@ -9,12 +9,24 @@ fa:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ fa:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/fi.yml b/modules/resource_management/config/locales/crowdin/fi.yml
index fa04f7a4b1e..27b3a902729 100644
--- a/modules/resource_management/config/locales/crowdin/fi.yml
+++ b/modules/resource_management/config/locales/crowdin/fi.yml
@@ -9,12 +9,24 @@ fi:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ fi:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/fil.yml b/modules/resource_management/config/locales/crowdin/fil.yml
index 1de09fb4b52..0d8d3263f10 100644
--- a/modules/resource_management/config/locales/crowdin/fil.yml
+++ b/modules/resource_management/config/locales/crowdin/fil.yml
@@ -9,12 +9,24 @@ fil:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ fil:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/fr.yml b/modules/resource_management/config/locales/crowdin/fr.yml
index 3d4936021bf..fd8c2fcf912 100644
--- a/modules/resource_management/config/locales/crowdin/fr.yml
+++ b/modules/resource_management/config/locales/crowdin/fr.yml
@@ -3,55 +3,71 @@ fr:
   activerecord:
     attributes:
       resource_planner:
-        name: Name
-        start_date: Start date
-        end_date: Finish date
-        default_view_class_name: Default view
+        name: Nom
+        start_date: Date de début
+        end_date: Date de fin
+        default_view_class_name: Vue par défaut
         public: Public
-        favorite: Favorite
+        favorite: Favori
+      resource_allocation:
+        entity: Entité
+        principal: Assigné à
+        state: État
+        start_date: Date de début
+        end_date: Date de fin
+        allocated_time: Temps alloué
+        user_filter: Filtre utilisateur
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
-              greater_than_start_date: must be after the start date.
+              greater_than_start_date: doit être postérieure à la date de début.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: doit être postérieure à la date de début.
   plugin_openproject_resource_management:
-    name: OpenProject Resource Management
-    description: Provides resource management and capacity planning.
-  project_module_resource_management: Resource management
-  permission_view_resource_planners: View resource planners
-  permission_view_resource_planners_explanation: 'Allows users to access resource planners. It allows them to create and manage their own resource planners and view public resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
+    name: Gestion des ressources d'OpenProject
+    description: Assure la gestion des ressources et la planification des capacités.
+  project_module_resource_management: Gestion des ressources
+  permission_view_resource_planners: Voir les planificateurs de ressources
+  permission_view_resource_planners_explanation: 'Permet aux utilisateurs d''accéder aux planificateurs de ressources. Cela leur permet de créer et de gérer leurs propres planificateurs de ressources et de consulter les planificateurs de ressources publics. Cela ne leur permet pas de consulter les planificateurs de ressources qui ont été créés par d''autres utilisateurs et qui ne sont pas partagés publiquement.
 
     '
-  permission_manage_public_resource_planners: Manage public resource planners
-  permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
+  permission_manage_public_resource_planners: Gérer les planificateurs de ressources publiques
+  permission_manage_public_resource_planners_explanation: 'Permet aux utilisateurs de créer et de gérer des planificateurs de ressources publics. Cela leur permet de visualiser, de créer, de gérer et de publier leurs propres planificateurs de ressources. Cela ne leur permet pas de visualiser les planificateurs de ressources qui ont été créés par d''autres utilisateurs et qui ne sont pas partagés publiquement.
 
     '
-  label_resource_management: Resource planning
-  button_next: Save
+  permission_allocate_user_resources: Attribuer des ressources aux utilisateurs
+  permission_allocate_user_resources_explanation: 'Permet aux utilisateurs de créer, mettre à jour et supprimer les allocations de ressources dans un planificateur de ressources. Cela inclut l''assignation d''utilisateurs (ou des filtres d''utilisateurs) à un planificateur et l''ajustement de la plage de temps et de dates allouées.
+
+    '
+  label_resource_management: Planification des ressources
+  button_next: Enregistrer
   resource_management:
-    label_resource_planner: Resource planner
-    label_resource_planner_plural: Resource planners
-    label_new_resource_planner: New resource planner
-    public_caption: 'Make this view public to all members of the project. This does not affect the visibility of work packages which still depends on each user permission.
+    label_resource_planner: Planificateur de ressources
+    label_resource_planner_plural: Planificateurs de ressources
+    label_new_resource_planner: Nouveau planificateur de ressources
+    public_caption: 'Rendez cette vue publique pour tous les membres du projet. Cela n''affecte pas la visibilité des lots de travaux, qui dépend toujours de l''autorisation de chaque utilisateur.
 
       '
-    favorite_caption: 'Make this view a favorite to add it on the top section of the sidebar menu.
+    favorite_caption: 'Faites de cette vue un favori pour l''ajouter à la section supérieure du menu de la barre latérale.
 
       '
     view_types:
-      UserCardView: Users cards
+      UserCardView: Cartes des utilisateurs
     action:
-      favorite: Add to favorites
-      unfavorite: Remove from favorites
-      make_public: Make public
-      make_private: Make private
-      delete: Delete
+      favorite: Ajouter aux favoris
+      unfavorite: Supprimer des favoris
+      make_public: Rendre public
+      make_private: Rendre privé
+      delete: Supprimer
     sidebar:
       public: Public
-      private: Private
+      private: Privé
     blankslate:
-      title: No resource planners yet
-      desc: Create a resource planner to start planning capacity for this project.
+      title: Aucun planificateur de ressources pour le moment
+      desc: Créez un planificateur de ressources pour commencer à planifier la capacité de ce projet.
     show:
-      placeholder: The detailed view for this resource planner is coming soon.
+      placeholder: La vue détaillée de ce planificateur de ressources sera bientôt disponible.
diff --git a/modules/resource_management/config/locales/crowdin/he.yml b/modules/resource_management/config/locales/crowdin/he.yml
index 29596abec4f..bf55ee92c99 100644
--- a/modules/resource_management/config/locales/crowdin/he.yml
+++ b/modules/resource_management/config/locales/crowdin/he.yml
@@ -9,12 +9,24 @@ he:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ he:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/hi.yml b/modules/resource_management/config/locales/crowdin/hi.yml
index 4436585c384..90b74d33fad 100644
--- a/modules/resource_management/config/locales/crowdin/hi.yml
+++ b/modules/resource_management/config/locales/crowdin/hi.yml
@@ -9,12 +9,24 @@ hi:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ hi:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/hr.yml b/modules/resource_management/config/locales/crowdin/hr.yml
index 151ad969fe6..a4b62f628ea 100644
--- a/modules/resource_management/config/locales/crowdin/hr.yml
+++ b/modules/resource_management/config/locales/crowdin/hr.yml
@@ -9,12 +9,24 @@ hr:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ hr:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/hu.yml b/modules/resource_management/config/locales/crowdin/hu.yml
index 2e39253caa3..f1c5d91068f 100644
--- a/modules/resource_management/config/locales/crowdin/hu.yml
+++ b/modules/resource_management/config/locales/crowdin/hu.yml
@@ -9,12 +9,24 @@ hu:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ hu:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/hy.yml b/modules/resource_management/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..760cb599496
--- /dev/null
+++ b/modules/resource_management/config/locales/crowdin/hy.yml
@@ -0,0 +1,73 @@
+---
+hy:
+  activerecord:
+    attributes:
+      resource_planner:
+        name: Name
+        start_date: Start date
+        end_date: Finish date
+        default_view_class_name: Default view
+        public: Public
+        favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
+    errors:
+      models:
+        resource_planner:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
+  plugin_openproject_resource_management:
+    name: OpenProject Resource Management
+    description: Provides resource management and capacity planning.
+  project_module_resource_management: Resource management
+  permission_view_resource_planners: View resource planners
+  permission_view_resource_planners_explanation: 'Allows users to access resource planners. It allows them to create and manage their own resource planners and view public resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
+
+    '
+  permission_manage_public_resource_planners: Manage public resource planners
+  permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
+
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
+    '
+  label_resource_management: Resource planning
+  button_next: Save
+  resource_management:
+    label_resource_planner: Resource planner
+    label_resource_planner_plural: Resource planners
+    label_new_resource_planner: New resource planner
+    public_caption: 'Make this view public to all members of the project. This does not affect the visibility of work packages which still depends on each user permission.
+
+      '
+    favorite_caption: 'Make this view a favorite to add it on the top section of the sidebar menu.
+
+      '
+    view_types:
+      UserCardView: Users cards
+    action:
+      favorite: Add to favorites
+      unfavorite: Remove from favorites
+      make_public: Make public
+      make_private: Make private
+      delete: Delete
+    sidebar:
+      public: Public
+      private: Private
+    blankslate:
+      title: No resource planners yet
+      desc: Create a resource planner to start planning capacity for this project.
+    show:
+      placeholder: The detailed view for this resource planner is coming soon.
diff --git a/modules/resource_management/config/locales/crowdin/id.yml b/modules/resource_management/config/locales/crowdin/id.yml
index de5d4053a3b..fd099276097 100644
--- a/modules/resource_management/config/locales/crowdin/id.yml
+++ b/modules/resource_management/config/locales/crowdin/id.yml
@@ -9,12 +9,24 @@ id:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ id:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/it.yml b/modules/resource_management/config/locales/crowdin/it.yml
index 936acf423aa..dff5c676314 100644
--- a/modules/resource_management/config/locales/crowdin/it.yml
+++ b/modules/resource_management/config/locales/crowdin/it.yml
@@ -9,12 +9,24 @@ it:
         default_view_class_name: Vista predefinita
         public: Pubblico
         favorite: Preferito
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: deve essere successiva alla data di inizio.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: Gestione delle risorse di OpenProject
     description: Fornisce funzionalità di gestione delle risorse e pianificazione della capacità.
@@ -26,6 +38,10 @@ it:
   permission_manage_public_resource_planners: Gestire i pianificatori di risorse pubbliche
   permission_manage_public_resource_planners_explanation: 'Consente agli utenti di creare e gestire pianificatori delle risorse pubblici. Permette loro di visualizzare, creare, gestire e pubblicare i propri pianificatori delle risorse. Non consente di visualizzare i pianificatori delle risorse creati da altri utenti che non sono condivisi pubblicamente.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Pianificazione delle risorse
   button_next: Salva
diff --git a/modules/resource_management/config/locales/crowdin/ja.yml b/modules/resource_management/config/locales/crowdin/ja.yml
index 42f6b1b00e6..6884f3a2c79 100644
--- a/modules/resource_management/config/locales/crowdin/ja.yml
+++ b/modules/resource_management/config/locales/crowdin/ja.yml
@@ -9,12 +9,24 @@ ja:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ja:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ka.yml b/modules/resource_management/config/locales/crowdin/ka.yml
index eab4b30d2ef..ab8317bc4d9 100644
--- a/modules/resource_management/config/locales/crowdin/ka.yml
+++ b/modules/resource_management/config/locales/crowdin/ka.yml
@@ -9,12 +9,24 @@ ka:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ka:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/kk.yml b/modules/resource_management/config/locales/crowdin/kk.yml
index 9150290ff5d..00dddbc2724 100644
--- a/modules/resource_management/config/locales/crowdin/kk.yml
+++ b/modules/resource_management/config/locales/crowdin/kk.yml
@@ -9,12 +9,24 @@ kk:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ kk:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ko.yml b/modules/resource_management/config/locales/crowdin/ko.yml
index 242d80cad28..99faa5f3aab 100644
--- a/modules/resource_management/config/locales/crowdin/ko.yml
+++ b/modules/resource_management/config/locales/crowdin/ko.yml
@@ -9,12 +9,24 @@ ko:
         default_view_class_name: 기본 보기
         public: 공개
         favorite: 즐겨찾기
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: "- 시작 날짜 후여야 합니다."
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject 리소스 관리
     description: 리소스 관리 및 용량 계획을 제공합니다.
@@ -26,6 +38,10 @@ ko:
   permission_manage_public_resource_planners: 공개 리소스 플래너 관리
   permission_manage_public_resource_planners_explanation: '사용자가 리소스 플래너를 만들고 관리하도록 허용합니다. 사용자는 고유한 리소스 플래너를 보고 만들고 관리하며 게시할 수 있습니다. 다른 사용자가 만든 공개적으로 공유되지 않은 리소스 플래너는 볼 수 없습니다.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: 리소스 계획
   button_next: 저장
diff --git a/modules/resource_management/config/locales/crowdin/lt.yml b/modules/resource_management/config/locales/crowdin/lt.yml
index 9a4219f1073..49d17398dbd 100644
--- a/modules/resource_management/config/locales/crowdin/lt.yml
+++ b/modules/resource_management/config/locales/crowdin/lt.yml
@@ -9,12 +9,24 @@ lt:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ lt:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/lv.yml b/modules/resource_management/config/locales/crowdin/lv.yml
index caa59fed06d..4746f888db5 100644
--- a/modules/resource_management/config/locales/crowdin/lv.yml
+++ b/modules/resource_management/config/locales/crowdin/lv.yml
@@ -9,12 +9,24 @@ lv:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ lv:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/mn.yml b/modules/resource_management/config/locales/crowdin/mn.yml
index b6ca4198572..07b2b83422e 100644
--- a/modules/resource_management/config/locales/crowdin/mn.yml
+++ b/modules/resource_management/config/locales/crowdin/mn.yml
@@ -9,12 +9,24 @@ mn:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ mn:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ms.yml b/modules/resource_management/config/locales/crowdin/ms.yml
index 16fd82b8ec1..35bc81cb0b2 100644
--- a/modules/resource_management/config/locales/crowdin/ms.yml
+++ b/modules/resource_management/config/locales/crowdin/ms.yml
@@ -9,12 +9,24 @@ ms:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ms:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ne.yml b/modules/resource_management/config/locales/crowdin/ne.yml
index 6a65cc5c380..2c45b23e61a 100644
--- a/modules/resource_management/config/locales/crowdin/ne.yml
+++ b/modules/resource_management/config/locales/crowdin/ne.yml
@@ -9,12 +9,24 @@ ne:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ne:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/nl.yml b/modules/resource_management/config/locales/crowdin/nl.yml
index f5da3c1a1a0..2504af0d5b5 100644
--- a/modules/resource_management/config/locales/crowdin/nl.yml
+++ b/modules/resource_management/config/locales/crowdin/nl.yml
@@ -9,12 +9,24 @@ nl:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ nl:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/no.yml b/modules/resource_management/config/locales/crowdin/no.yml
index 409178aaa50..f61aebe7dd7 100644
--- a/modules/resource_management/config/locales/crowdin/no.yml
+++ b/modules/resource_management/config/locales/crowdin/no.yml
@@ -9,12 +9,24 @@
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/pl.yml b/modules/resource_management/config/locales/crowdin/pl.yml
index 1f4f60810a1..0f1693577cf 100644
--- a/modules/resource_management/config/locales/crowdin/pl.yml
+++ b/modules/resource_management/config/locales/crowdin/pl.yml
@@ -9,12 +9,24 @@ pl:
         default_view_class_name: Widok domyślny
         public: Publiczny
         favorite: Ulubione
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: musi być późniejsza niż data rozpoczęcia.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: Zarządzanie zasobami OpenProject
     description: Zapewnia zarządzanie zasobami i planowanie obciążeń.
@@ -26,6 +38,10 @@ pl:
   permission_manage_public_resource_planners: Zarządzaj publicznymi planistami zasobów
   permission_manage_public_resource_planners_explanation: 'Umożliwia użytkownikom tworzenie planistów zasobów oraz zarządzanie nimi. Pozwala im na przeglądanie, tworzenie, zarządzanie i publikowanie własnych planistów zasobów. Nie pozwala użytkownikom przeglądać nieudostępnionych publicznie planistów zasobów utworzonych przez innych użytkowników.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Planowanie zasobów
   button_next: Zapisz
diff --git a/modules/resource_management/config/locales/crowdin/pt-BR.yml b/modules/resource_management/config/locales/crowdin/pt-BR.yml
index 764253df568..610423d93cd 100644
--- a/modules/resource_management/config/locales/crowdin/pt-BR.yml
+++ b/modules/resource_management/config/locales/crowdin/pt-BR.yml
@@ -9,12 +9,24 @@ pt-BR:
         default_view_class_name: Visualização padrão
         public: Público
         favorite: Favorito
+      resource_allocation:
+        entity: Entidade
+        principal: Atribuição
+        state: Estado
+        start_date: Data de início
+        end_date: Data de término
+        allocated_time: Tempo alocado
+        user_filter: Filtro de usuários
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: deve ser após a data de início.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: deve ser após a data de início.
   plugin_openproject_resource_management:
     name: Gerenciamento de recursos do OpenProject
     description: Fornece gerenciamento de recursos e planejamento de capacidade.
@@ -26,6 +38,10 @@ pt-BR:
   permission_manage_public_resource_planners: Gerenciar planejadores de recursos públicos
   permission_manage_public_resource_planners_explanation: 'Permite que os usuários criem e gerenciem planejadores de recursos públicos. Permite visualizar, criar, gerenciar e publicar seus próprios planejadores de recursos. Não permite visualizar planejadores de recursos criados por outros usuários que não estejam compartilhados publicamente.
 
+    '
+  permission_allocate_user_resources: Alocar recursos do usuário
+  permission_allocate_user_resources_explanation: 'Permite aos usuários criar, atualizar e excluir alocações de recursos dentro de um planejador de recursos. Isto inclui atribuir usuários (ou filtros de usuários) a um planejador e ajustar o tempo e intervalo de datas alocados.
+
     '
   label_resource_management: Planejamento de recursos
   button_next: Salvar
diff --git a/modules/resource_management/config/locales/crowdin/pt-PT.yml b/modules/resource_management/config/locales/crowdin/pt-PT.yml
index e8825d2c0af..c3b38fd6f5a 100644
--- a/modules/resource_management/config/locales/crowdin/pt-PT.yml
+++ b/modules/resource_management/config/locales/crowdin/pt-PT.yml
@@ -9,12 +9,24 @@ pt-PT:
         default_view_class_name: Vista padrão
         public: Público
         favorite: Favorito
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: deve ser após a data de início.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: Gestão de recursos do OpenProject
     description: Fornece gestão de recursos e planeamento de capacidades.
@@ -26,6 +38,10 @@ pt-PT:
   permission_manage_public_resource_planners: Gerir os planeadores de recursos públicos
   permission_manage_public_resource_planners_explanation: 'Permite aos utilizadores criar e gerir planeadores de recursos públicos. Permite ver, criar, gerir e publicar os seus próprios planeadores de recursos. Não permite que os utilizadores vejam os planeadores de recursos criados por outros utilizadores que não estejam partilhados publicamente.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Planeamento de recursos
   button_next: Guardar
diff --git a/modules/resource_management/config/locales/crowdin/ro.yml b/modules/resource_management/config/locales/crowdin/ro.yml
index 514461fac8d..23b74f3b3e4 100644
--- a/modules/resource_management/config/locales/crowdin/ro.yml
+++ b/modules/resource_management/config/locales/crowdin/ro.yml
@@ -9,12 +9,24 @@ ro:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ ro:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/ru.yml b/modules/resource_management/config/locales/crowdin/ru.yml
index 809555f31d2..0de57047b9c 100644
--- a/modules/resource_management/config/locales/crowdin/ru.yml
+++ b/modules/resource_management/config/locales/crowdin/ru.yml
@@ -9,12 +9,24 @@ ru:
         default_view_class_name: Представление по умолчанию
         public: Публичный
         favorite: Избранное
+      resource_allocation:
+        entity: Сущность
+        principal: Исполнитель
+        state: Состояние
+        start_date: Дата начала
+        end_date: Дата окончания
+        allocated_time: Распределенное время
+        user_filter: Фильтры пользователей
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: должно быть после даты начала.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: должно быть после даты начала.
   plugin_openproject_resource_management:
     name: Управление ресурсами OpenProject
     description: Обеспечивает управление ресурсами и планирование возможностей.
@@ -26,6 +38,10 @@ ru:
   permission_manage_public_resource_planners: Управление общедоступными планировщиками ресурсов
   permission_manage_public_resource_planners_explanation: 'Позволяет пользователям создавать и управлять общедоступными планировщиками ресурсов. Это позволяет просматривать, создавать, управлять и публиковать свои собственные планировщики ресурсов. Он не позволяет пользователям просматривать планировщики ресурсов, созданные другими пользователями, которые не являются общедоступными.
 
+    '
+  permission_allocate_user_resources: Распределение пользовательских ресурсов
+  permission_allocate_user_resources_explanation: 'Позволяет пользователям создавать, обновлять и удалять распределение ресурсов в планировщике ресурсов. Сюда входит назначение пользователей (или фильтров) на планировщик и корректировка выделенного времени и диапазона дат.
+
     '
   label_resource_management: Планирование ресурсов
   button_next: Сохранить
diff --git a/modules/resource_management/config/locales/crowdin/rw.yml b/modules/resource_management/config/locales/crowdin/rw.yml
index 870e3aa1acb..541b47d180b 100644
--- a/modules/resource_management/config/locales/crowdin/rw.yml
+++ b/modules/resource_management/config/locales/crowdin/rw.yml
@@ -9,12 +9,24 @@ rw:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ rw:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/si.yml b/modules/resource_management/config/locales/crowdin/si.yml
index 596919b6431..3a38dd899c5 100644
--- a/modules/resource_management/config/locales/crowdin/si.yml
+++ b/modules/resource_management/config/locales/crowdin/si.yml
@@ -9,12 +9,24 @@ si:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ si:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/sk.yml b/modules/resource_management/config/locales/crowdin/sk.yml
index 12fc6f2465e..624ce9967bc 100644
--- a/modules/resource_management/config/locales/crowdin/sk.yml
+++ b/modules/resource_management/config/locales/crowdin/sk.yml
@@ -9,12 +9,24 @@ sk:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ sk:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/sl.yml b/modules/resource_management/config/locales/crowdin/sl.yml
index ff2edba0f8f..eb52beac050 100644
--- a/modules/resource_management/config/locales/crowdin/sl.yml
+++ b/modules/resource_management/config/locales/crowdin/sl.yml
@@ -9,12 +9,24 @@ sl:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ sl:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/sr.yml b/modules/resource_management/config/locales/crowdin/sr.yml
index a34172a9d88..30744ae0982 100644
--- a/modules/resource_management/config/locales/crowdin/sr.yml
+++ b/modules/resource_management/config/locales/crowdin/sr.yml
@@ -9,12 +9,24 @@ sr:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ sr:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/sv.yml b/modules/resource_management/config/locales/crowdin/sv.yml
index 309c9de6084..626749d3a50 100644
--- a/modules/resource_management/config/locales/crowdin/sv.yml
+++ b/modules/resource_management/config/locales/crowdin/sv.yml
@@ -9,12 +9,24 @@ sv:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ sv:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/th.yml b/modules/resource_management/config/locales/crowdin/th.yml
index c72649102b8..5fdc99d8e55 100644
--- a/modules/resource_management/config/locales/crowdin/th.yml
+++ b/modules/resource_management/config/locales/crowdin/th.yml
@@ -9,12 +9,24 @@ th:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ th:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/tr.yml b/modules/resource_management/config/locales/crowdin/tr.yml
index bb18caef1f1..57fb3686449 100644
--- a/modules/resource_management/config/locales/crowdin/tr.yml
+++ b/modules/resource_management/config/locales/crowdin/tr.yml
@@ -9,12 +9,24 @@ tr:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ tr:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/uk.yml b/modules/resource_management/config/locales/crowdin/uk.yml
index b6488fbcd03..24b2aed46cd 100644
--- a/modules/resource_management/config/locales/crowdin/uk.yml
+++ b/modules/resource_management/config/locales/crowdin/uk.yml
@@ -9,12 +9,24 @@ uk:
         default_view_class_name: Типове подання
         public: Загальнодоступне
         favorite: Вибране
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: не має передувати даті початку.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: Керування ресурсами OpenProject
     description: Забезпечує керування ресурсами й планування завантаження.
@@ -26,6 +38,10 @@ uk:
   permission_manage_public_resource_planners: Керувати загальнодоступними планувальниками ресурсів
   permission_manage_public_resource_planners_explanation: 'Дає змогу користувачам створювати загальнодоступні планувальники ресурсів і керувати ними. Дозволяє їм переглядати, створювати й публікувати власні планувальники ресурсів, а також керувати ними. Не дозволяє переглядати планувальники ресурсів інших користувачів, які не є загальнодоступними.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Планування ресурсів
   button_next: Зберегти
diff --git a/modules/resource_management/config/locales/crowdin/uz.yml b/modules/resource_management/config/locales/crowdin/uz.yml
index 76165b86808..a338609a31f 100644
--- a/modules/resource_management/config/locales/crowdin/uz.yml
+++ b/modules/resource_management/config/locales/crowdin/uz.yml
@@ -9,12 +9,24 @@ uz:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ uz:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/vi.yml b/modules/resource_management/config/locales/crowdin/vi.yml
index e3d2abf85d5..f8b6065854a 100644
--- a/modules/resource_management/config/locales/crowdin/vi.yml
+++ b/modules/resource_management/config/locales/crowdin/vi.yml
@@ -9,12 +9,24 @@ vi:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ vi:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/crowdin/zh-CN.yml b/modules/resource_management/config/locales/crowdin/zh-CN.yml
index b42e6e4f8d7..95d298b086e 100644
--- a/modules/resource_management/config/locales/crowdin/zh-CN.yml
+++ b/modules/resource_management/config/locales/crowdin/zh-CN.yml
@@ -9,12 +9,24 @@ zh-CN:
         default_view_class_name: 默认视图
         public: 公开
         favorite: 收藏夹
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: 必须在开始日期之后。
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject 资源管理
     description: 提供资源管理和能力规划。
@@ -26,6 +38,10 @@ zh-CN:
   permission_manage_public_resource_planners: 管理公开的资源规划工具
   permission_manage_public_resource_planners_explanation: '允许用户创建和管理公开的资源规划工具。用户可以查看、创建、管理和发布自己的资源规划工具，但不可以查看其他用户创建的未公开共享的资源规划工具。
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: 资源规划
   button_next: 保存
diff --git a/modules/resource_management/config/locales/crowdin/zh-TW.yml b/modules/resource_management/config/locales/crowdin/zh-TW.yml
index bbcbe8cb2bd..0eb51e9ae56 100644
--- a/modules/resource_management/config/locales/crowdin/zh-TW.yml
+++ b/modules/resource_management/config/locales/crowdin/zh-TW.yml
@@ -9,12 +9,24 @@ zh-TW:
         default_view_class_name: Default view
         public: Public
         favorite: Favorite
+      resource_allocation:
+        entity: Entity
+        principal: Assignee
+        state: State
+        start_date: Start date
+        end_date: Finish date
+        allocated_time: Allocated time
+        user_filter: User filter
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: must be after the start date.
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: must be after the start date.
   plugin_openproject_resource_management:
     name: OpenProject Resource Management
     description: Provides resource management and capacity planning.
@@ -26,6 +38,10 @@ zh-TW:
   permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: 'Allows users to create and manage public resource planners. It allows them to view, create, manage and publish their own resource planners. It does not allow users to view resource planners created by other users that are not shared publicly.
 
+    '
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: 'Allows users to create, update, and delete resource allocations within a resource planner. This includes assigning users (or user filters) to a planner and adjusting the allocated time and date range.
+
     '
   label_resource_management: Resource planning
   button_next: Save
diff --git a/modules/resource_management/config/locales/en.yml b/modules/resource_management/config/locales/en.yml
index 875e89294e1..cd3ffc82fe0 100644
--- a/modules/resource_management/config/locales/en.yml
+++ b/modules/resource_management/config/locales/en.yml
@@ -8,12 +8,24 @@ en:
         default_view_class_name: "Default view"
         public: "Public"
         favorite: "Favorite"
+      resource_allocation:
+        entity: "Entity"
+        principal: "Assignee"
+        state: "State"
+        start_date: "Start date"
+        end_date: "Finish date"
+        allocated_time: "Allocated time"
+        user_filter: "User filter"
     errors:
       models:
         resource_planner:
           attributes:
             end_date:
               greater_than_start_date: "must be after the start date."
+        resource_allocation:
+          attributes:
+            end_date:
+              greater_than_start_date: "must be after the start date."
 
   plugin_openproject_resource_management:
     name: "OpenProject Resource Management"
@@ -32,6 +44,11 @@ en:
     to view, create, manage and publish their own resource planners. It does not
     allow users to view resource planners created by other users that are not
     shared publicly.
+  permission_allocate_user_resources: "Allocate user resources"
+  permission_allocate_user_resources_explanation: >
+    Allows users to create, update, and delete resource allocations within
+    a resource planner. This includes assigning users (or user filters) to
+    a planner and adjusting the allocated time and date range.
 
   label_resource_management: "Resource planning"
   button_next: "Save" # TODO: This should be "Next" but we need to check the flow first
diff --git a/modules/resource_management/db/migrate/20260507141533_create_resource_allocations.rb b/modules/resource_management/db/migrate/20260507141533_create_resource_allocations.rb
new file mode 100644
index 00000000000..be17eefbe7e
--- /dev/null
+++ b/modules/resource_management/db/migrate/20260507141533_create_resource_allocations.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateResourceAllocations < ActiveRecord::Migration[8.1]
+  def change
+    create_table :resource_allocations do |t|
+      t.references :entity, polymorphic: true, null: false
+      t.references :principal, foreign_key: { to_table: :users }, null: true
+      t.jsonb :user_filter, default: []
+      t.string :state, null: false
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.integer :allocated_time, null: false
+
+      t.timestamps
+
+      t.index :state
+      t.index %i[start_date end_date]
+    end
+  end
+end
diff --git a/modules/resource_management/lib/open_project/resource_management/engine.rb b/modules/resource_management/lib/open_project/resource_management/engine.rb
index f68a9d6d197..52ba7d9ee08 100644
--- a/modules/resource_management/lib/open_project/resource_management/engine.rb
+++ b/modules/resource_management/lib/open_project/resource_management/engine.rb
@@ -40,6 +40,8 @@ module OpenProject::ResourceManagement
       OpenProject::FeatureDecisions.add :resource_management, allow_enabling: Rails.env.local?
     end
 
+    replace_principal_references "ResourceAllocation" => :principal_id
+
     register "openproject-resource_management",
              author_url: "https://www.openproject.org",
              bundled: true,
@@ -64,6 +66,17 @@ module OpenProject::ResourceManagement
                    { "resource_management/resource_planners": %i[toggle_public] },
                    permissible_on: :project,
                    dependencies: %i[view_resource_planners]
+
+        # `allocate_user_resources` gates create/update/delete on
+        # ResourceAllocation records. No controller actions yet — the
+        # ResourceAllocations::*Contract classes consume this directly via
+        # `allowed_in_project?`. The `contract_actions` map keeps the
+        # permission discoverable for API contracts.
+        permission :allocate_user_resources,
+                   {},
+                   permissible_on: :project,
+                   dependencies: %i[view_resource_planners],
+                   contract_actions: { resource_allocation: %i[create update destroy] }
       end
 
       # TODO: Add those menus when global overview will be implemented
diff --git a/modules/resource_management/spec/contracts/resource_allocations/create_contract_spec.rb b/modules/resource_management/spec/contracts/resource_allocations/create_contract_spec.rb
new file mode 100644
index 00000000000..72427bd9319
--- /dev/null
+++ b/modules/resource_management/spec/contracts/resource_allocations/create_contract_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "shared_contract_examples"
+
+RSpec.describe ResourceAllocations::CreateContract do
+  include_context "ModelContract shared context"
+
+  it_behaves_like "resource allocation contract" do
+    let(:contract) { described_class.new(resource_allocation, current_user) }
+  end
+
+  describe "writable attributes" do
+    let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+    let(:current_user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+    end
+    let(:planner) { create(:resource_planner, project:, principal: current_user) }
+    let(:resource_allocation) { build_stubbed(:resource_allocation, entity: planner, principal: current_user) }
+    let(:contract) { described_class.new(resource_allocation, current_user) }
+
+    it "allows entity to be set" do
+      expect(contract.writable?(:entity)).to be(true)
+    end
+
+    it "allows principal, state, dates, allocated_time, and user_filter" do
+      %i[principal state start_date end_date allocated_time user_filter].each do |attr|
+        expect(contract.writable?(attr)).to be(true), "expected #{attr} to be writable"
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/spec/contracts/resource_allocations/delete_contract_spec.rb b/modules/resource_management/spec/contracts/resource_allocations/delete_contract_spec.rb
new file mode 100644
index 00000000000..a73a6ea38cd
--- /dev/null
+++ b/modules/resource_management/spec/contracts/resource_allocations/delete_contract_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe ResourceAllocations::DeleteContract do
+  include_context "ModelContract shared context"
+
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:owner) { create(:user) }
+  shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+  let(:resource_allocation) { build_stubbed(:resource_allocation, entity: planner, principal: owner) }
+  let(:contract) { described_class.new(resource_allocation, current_user) }
+
+  context "when user has allocate_user_resources" do
+    let(:current_user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+    end
+
+    it_behaves_like "contract is valid"
+  end
+
+  context "when user only has view_resource_planners" do
+    let(:current_user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners] })
+    end
+
+    it_behaves_like "contract user is unauthorized"
+  end
+
+  context "when user has no permissions on the project" do
+    let(:current_user) { create(:user) }
+
+    it_behaves_like "contract user is unauthorized"
+  end
+end
diff --git a/modules/resource_management/spec/contracts/resource_allocations/shared_contract_examples.rb b/modules/resource_management/spec/contracts/resource_allocations/shared_contract_examples.rb
new file mode 100644
index 00000000000..6dc00ed586e
--- /dev/null
+++ b/modules/resource_management/spec/contracts/resource_allocations/shared_contract_examples.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.shared_examples_for "resource allocation contract" do
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:owner) { create(:user) }
+  shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+  let(:resource_allocation) do
+    build_stubbed(:resource_allocation, entity: planner, principal: owner)
+  end
+
+  context "when user has the allocate_user_resources permission" do
+    let(:current_user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+    end
+
+    it_behaves_like "contract is valid"
+  end
+
+  context "when user only has view_resource_planners" do
+    let(:current_user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners] })
+    end
+
+    it_behaves_like "contract user is unauthorized"
+  end
+
+  context "when user has no permissions on the project" do
+    let(:current_user) { create(:user) }
+
+    it_behaves_like "contract user is unauthorized"
+  end
+end
diff --git a/modules/resource_management/spec/contracts/resource_allocations/update_contract_spec.rb b/modules/resource_management/spec/contracts/resource_allocations/update_contract_spec.rb
new file mode 100644
index 00000000000..e21158a8e33
--- /dev/null
+++ b/modules/resource_management/spec/contracts/resource_allocations/update_contract_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "shared_contract_examples"
+
+RSpec.describe ResourceAllocations::UpdateContract do
+  include_context "ModelContract shared context"
+
+  it_behaves_like "resource allocation contract" do
+    let(:contract) { described_class.new(resource_allocation, current_user) }
+  end
+
+  describe "writable attributes" do
+    let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+    let(:current_user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+    end
+    let(:planner) { create(:resource_planner, project:, principal: current_user) }
+    let(:resource_allocation) { build_stubbed(:resource_allocation, entity: planner, principal: current_user) }
+    let(:contract) { described_class.new(resource_allocation, current_user) }
+
+    it "does not allow entity to be set" do
+      expect(contract.writable?(:entity)).to be(false)
+    end
+
+    it "allows principal, state, dates, allocated_time, and user_filter" do
+      %i[principal state start_date end_date allocated_time user_filter].each do |attr|
+        expect(contract.writable?(attr)).to be(true), "expected #{attr} to be writable"
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/spec/factories/resource_allocation_factory.rb b/modules/resource_management/spec/factories/resource_allocation_factory.rb
new file mode 100644
index 00000000000..f277279473e
--- /dev/null
+++ b/modules/resource_management/spec/factories/resource_allocation_factory.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+FactoryBot.define do
+  factory :resource_allocation, class: "ResourceAllocation" do
+    entity factory: :resource_planner
+    principal factory: :user
+    state { "requested" }
+    start_date { Date.new(2026, 1, 5) }
+    end_date { Date.new(2026, 1, 9) }
+    allocated_time { 5 * 8 * 60 } # 5 days of 8 hours in minutes
+    user_filter { [] }
+
+    traits_for_enum :state
+
+    trait :with_user_filter do
+      principal { nil }
+      transient do
+        job_title_custom_field do
+          UserCustomField.find_by(name: "Job title") ||
+            create(:user_custom_field, :list,
+                   name: "Job title",
+                   possible_values: ["Developer", "Designer", "Project Manager", "Product Manager"])
+        end
+      end
+      user_filter do
+        cf = job_title_custom_field
+        developer_option = cf.custom_options.find_by(value: "Developer")
+        [
+          {
+            "attribute" => cf.column_name,
+            "operator" => "=",
+            "values" => [developer_option.id.to_s]
+          }
+        ]
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/spec/models/resource_allocation_spec.rb b/modules/resource_management/spec/models/resource_allocation_spec.rb
new file mode 100644
index 00000000000..233770a069e
--- /dev/null
+++ b/modules/resource_management/spec/models/resource_allocation_spec.rb
@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe ResourceAllocation do
+  describe "associations" do
+    it "belongs to a polymorphic entity" do
+      association = described_class.reflect_on_association(:entity)
+      expect(association.macro).to eq(:belongs_to)
+      expect(association.options[:polymorphic]).to be(true)
+    end
+
+    it "belongs to a principal (user), optional" do
+      association = described_class.reflect_on_association(:principal)
+      expect(association.macro).to eq(:belongs_to)
+      expect(association.options[:class_name]).to eq("User")
+      expect(association.options[:optional]).to be(true)
+    end
+  end
+
+  describe "state enum" do
+    it "exposes the four allowed string-backed states" do
+      expect(described_class.states).to eq(
+        "requested" => "requested",
+        "allocated" => "allocated",
+        "rejected" => "rejected",
+        "canceled" => "canceled"
+      )
+    end
+
+    it "rejects unknown state values" do
+      expect { described_class.new(state: "unknown") }.to raise_error(ArgumentError)
+    end
+
+    it "exposes a factory trait per state value" do
+      described_class.states.each_key do |value|
+        expect(build(:resource_allocation, value.to_sym).state).to eq(value)
+      end
+    end
+  end
+
+  describe "validations" do
+    shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+    shared_let(:owner) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
+    shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+    let(:allocation) { build(:resource_allocation, entity: planner, principal: owner) }
+
+    it "is valid with the factory defaults" do
+      expect(allocation).to be_valid
+    end
+
+    describe "presence" do
+      it "requires entity" do
+        allocation.entity = nil
+        expect(allocation).not_to be_valid
+        expect(allocation.errors[:entity]).to be_present
+      end
+
+      it "requires state" do
+        allocation.state = nil
+        expect(allocation).not_to be_valid
+        expect(allocation.errors[:state]).to be_present
+      end
+
+      it "requires start_date" do
+        allocation.start_date = nil
+        expect(allocation).not_to be_valid
+        expect(allocation.errors[:start_date]).to be_present
+      end
+
+      it "requires end_date" do
+        allocation.end_date = nil
+        expect(allocation).not_to be_valid
+        expect(allocation.errors[:end_date]).to be_present
+      end
+
+      it "requires allocated_time" do
+        allocation.allocated_time = nil
+        expect(allocation).not_to be_valid
+        expect(allocation.errors[:allocated_time]).to be_present
+      end
+
+      it "does not require principal (column is nullable)" do
+        allocation.principal = nil
+        expect(allocation).to be_valid
+      end
+    end
+
+    describe "allocated_time numericality" do
+      it "is invalid when zero" do
+        allocation.allocated_time = 0
+        expect(allocation).not_to be_valid
+        expect(allocation.errors.symbols_for(:allocated_time)).to include(:greater_than)
+      end
+
+      it "is invalid when negative" do
+        allocation.allocated_time = -1
+        expect(allocation).not_to be_valid
+        expect(allocation.errors.symbols_for(:allocated_time)).to include(:greater_than)
+      end
+
+      it "is valid when positive" do
+        allocation.allocated_time = 1
+        expect(allocation).to be_valid
+      end
+    end
+
+    describe "date range" do
+      context "when end_date is after start_date" do
+        before do
+          allocation.start_date = Date.new(2026, 1, 1)
+          allocation.end_date = Date.new(2026, 1, 2)
+        end
+
+        it "is valid" do
+          expect(allocation).to be_valid
+        end
+      end
+
+      context "when end_date equals start_date" do
+        before do
+          allocation.start_date = Date.new(2026, 1, 1)
+          allocation.end_date = Date.new(2026, 1, 1)
+        end
+
+        it "is invalid" do
+          expect(allocation).not_to be_valid
+          expect(allocation.errors.symbols_for(:end_date)).to include(:greater_than_start_date)
+        end
+      end
+
+      context "when end_date is before start_date" do
+        before do
+          allocation.start_date = Date.new(2026, 1, 5)
+          allocation.end_date = Date.new(2026, 1, 2)
+        end
+
+        it "is invalid" do
+          expect(allocation).not_to be_valid
+          expect(allocation.errors.symbols_for(:end_date)).to include(:greater_than_start_date)
+        end
+      end
+    end
+  end
+
+  describe "user_filter serialization" do
+    shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+    shared_let(:owner) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
+    shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+    it "serializes filters using the same coder as UserQuery" do
+      coder = described_class.type_for_attribute(:user_filter).coder
+      user_query_coder = UserQuery.type_for_attribute(:filters).coder
+
+      expect(coder).to be_a(Queries::Serialization::Filters)
+      expect(coder.klass).to eq(UserQuery)
+      expect(coder.registered_filters).to eq(user_query_coder.registered_filters)
+    end
+
+    it "round-trips a UserQuery filter through the database" do
+      filter = UserQuery.new.filter_for(:name)
+      filter.operator = "~"
+      filter.values = ["alice"]
+
+      allocation = create(:resource_allocation, entity: planner, principal: owner, user_filter: [filter])
+
+      reloaded = described_class.find(allocation.id)
+      expect(reloaded.user_filter.size).to eq(1)
+      expect(reloaded.user_filter.first).to be_a(Queries::Users::Filters::NameFilter)
+      expect(reloaded.user_filter.first.operator).to eq("~")
+      expect(reloaded.user_filter.first.values).to eq(["alice"])
+    end
+
+    it "defaults to an empty array" do
+      allocation = create(:resource_allocation, entity: planner, principal: owner)
+      expect(allocation.reload.user_filter).to eq([])
+    end
+  end
+end
diff --git a/modules/resource_management/spec/services/principals/delete_job_integration_spec.rb b/modules/resource_management/spec/services/principals/delete_job_integration_spec.rb
new file mode 100644
index 00000000000..ee088244782
--- /dev/null
+++ b/modules/resource_management/spec/services/principals/delete_job_integration_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Principals::DeleteJob, "ResourceAllocation", type: :model do
+  subject(:job) { described_class.perform_now(principal) }
+
+  shared_let(:deleted_user) { create(:deleted_user) }
+  let(:principal) { create(:user) }
+
+  context "with a resource allocation assigned to the principal" do
+    let!(:allocation) { create(:resource_allocation, principal:) }
+    let!(:other_allocation) { create(:resource_allocation, principal: create(:user)) }
+    let!(:unassigned_allocation) { create(:resource_allocation, principal: nil) }
+
+    it "rewrites the principal to the deleted user placeholder" do
+      job
+
+      expect(allocation.reload.principal).to eq deleted_user
+    end
+
+    it "does not affect allocations belonging to other users" do
+      expect { job }.not_to change { other_allocation.reload.principal }
+    end
+
+    it "does not affect unassigned allocations" do
+      expect { job }.not_to change { unassigned_allocation.reload.principal_id }
+    end
+  end
+end
diff --git a/modules/resource_management/spec/services/resource_allocations/create_service_spec.rb b/modules/resource_management/spec/services/resource_allocations/create_service_spec.rb
new file mode 100644
index 00000000000..213d86df16d
--- /dev/null
+++ b/modules/resource_management/spec/services/resource_allocations/create_service_spec.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe ResourceAllocations::CreateService, type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:owner) do
+    create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+  end
+  shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+  let(:assignee) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
+  let(:params) do
+    {
+      entity: planner,
+      principal: assignee,
+      start_date: Date.new(2026, 1, 1),
+      end_date: Date.new(2026, 1, 31),
+      allocated_time: 8
+    }
+  end
+
+  subject(:service_call) { described_class.new(user: owner).call(params) }
+
+  it "creates a resource allocation" do
+    result = service_call
+    expect(result).to be_success, "expected success but got: #{result.errors.full_messages}"
+    expect(result.result.entity).to eq(planner)
+    expect(result.result.principal).to eq(assignee)
+    expect(result.result.allocated_time).to eq(8)
+  end
+
+  it "defaults the state to requested" do
+    expect(service_call.result.state).to eq("requested")
+  end
+
+  it "honors an explicitly-passed state" do
+    result = described_class.new(user: owner).call(params.merge(state: "allocated"))
+    expect(result.result.state).to eq("allocated")
+  end
+
+  context "when allocated_time is zero" do
+    it "fails with a numericality error" do
+      result = described_class.new(user: owner).call(params.merge(allocated_time: 0))
+      expect(result).not_to be_success
+      expect(result.errors.symbols_for(:allocated_time)).to include(:greater_than)
+    end
+  end
+
+  context "when end_date is before start_date" do
+    it "fails the date-range validation" do
+      result = described_class.new(user: owner).call(
+        params.merge(start_date: Date.new(2026, 2, 1), end_date: Date.new(2026, 1, 1))
+      )
+      expect(result).not_to be_success
+      expect(result.errors.symbols_for(:end_date)).to include(:greater_than_start_date)
+    end
+  end
+
+  context "when user lacks allocate_user_resources" do
+    let(:user) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
+
+    it "fails with an authorization error" do
+      result = described_class.new(user:).call(params)
+      expect(result).not_to be_success
+      expect(result.errors[:base]).to include(I18n.t("activerecord.errors.messages.error_unauthorized"))
+    end
+  end
+end
diff --git a/modules/resource_management/spec/services/resource_allocations/delete_service_spec.rb b/modules/resource_management/spec/services/resource_allocations/delete_service_spec.rb
new file mode 100644
index 00000000000..2cd83d64c93
--- /dev/null
+++ b/modules/resource_management/spec/services/resource_allocations/delete_service_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe ResourceAllocations::DeleteService, type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:owner) do
+    create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+  end
+  shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+  let!(:resource_allocation) { create(:resource_allocation, entity: planner, principal: owner) }
+
+  subject(:service_call) do
+    described_class.new(user:, model: resource_allocation).call
+  end
+
+  context "when user has allocate_user_resources" do
+    let(:user) { owner }
+
+    it "destroys the allocation" do
+      expect { service_call }.to change(ResourceAllocation, :count).by(-1)
+      expect(service_call).to be_success
+    end
+  end
+
+  context "when user lacks allocate_user_resources" do
+    let(:user) do
+      create(:user, member_with_permissions: { project => %i[view_resource_planners] })
+    end
+
+    it "fails without destroying" do
+      expect { service_call }.not_to change(ResourceAllocation, :count)
+      expect(service_call).not_to be_success
+    end
+  end
+
+  context "when user has no permissions on the project" do
+    let(:user) { create(:user) }
+
+    it "fails without destroying" do
+      expect { service_call }.not_to change(ResourceAllocation, :count)
+      expect(service_call).not_to be_success
+    end
+  end
+end
diff --git a/modules/resource_management/spec/services/resource_allocations/update_service_spec.rb b/modules/resource_management/spec/services/resource_allocations/update_service_spec.rb
new file mode 100644
index 00000000000..81ae0bd5e57
--- /dev/null
+++ b/modules/resource_management/spec/services/resource_allocations/update_service_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe ResourceAllocations::UpdateService, type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:owner) do
+    create(:user, member_with_permissions: { project => %i[view_resource_planners allocate_user_resources] })
+  end
+  shared_let(:planner) { create(:resource_planner, project:, principal: owner) }
+
+  let!(:resource_allocation) do
+    create(:resource_allocation, entity: planner, principal: owner, state: "requested", allocated_time: 8)
+  end
+
+  subject(:service_call) do
+    described_class.new(user: owner, model: resource_allocation).call(state: "allocated", allocated_time: 16)
+  end
+
+  it "updates the resource allocation" do
+    expect(service_call).to be_success
+    expect(resource_allocation.reload.state).to eq("allocated")
+    expect(resource_allocation.allocated_time).to eq(16)
+  end
+
+  context "when attempting to change the entity" do
+    let(:other_planner) { create(:resource_planner, project:, principal: owner) }
+
+    it "fails because entity is not writable" do
+      result = described_class.new(user: owner, model: resource_allocation).call(entity: other_planner)
+      expect(result).not_to be_success
+      expect(result.errors.symbols_for(:entity_id)).to include(:error_readonly)
+      expect(resource_allocation.reload.entity).to eq(planner)
+    end
+  end
+
+  context "when user lacks allocate_user_resources" do
+    let(:user) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
+
+    it "fails with an authorization error" do
+      result = described_class.new(user:, model: resource_allocation).call(state: "allocated")
+      expect(result).not_to be_success
+      expect(result.errors[:base]).to include(I18n.t("activerecord.errors.messages.error_unauthorized"))
+    end
+  end
+end
diff --git a/modules/storages/app/common/storages/adapters/providers/nextcloud/nextcloud_registry.rb b/modules/storages/app/common/storages/adapters/providers/nextcloud/nextcloud_registry.rb
index bea0fccfdac..4fbdd7c80aa 100644
--- a/modules/storages/app/common/storages/adapters/providers/nextcloud/nextcloud_registry.rb
+++ b/modules/storages/app/common/storages/adapters/providers/nextcloud/nextcloud_registry.rb
@@ -32,7 +32,7 @@ module Storages
   module Adapters
     module Providers
       module Nextcloud
-        NextcloudRegistry = Dry::Container::Namespace.new("nextcloud") do
+        NextcloudRegistry = Dry::Core::Container::Namespace.new("nextcloud") do
           namespace("authentication") do
             register(:userless, ->(*) { Input::Strategy.build(key: :basic_auth) })
             register(:user_bound, UserBoundAuthentication)
diff --git a/modules/storages/app/common/storages/adapters/providers/one_drive/one_drive_registry.rb b/modules/storages/app/common/storages/adapters/providers/one_drive/one_drive_registry.rb
index a648ad25b1f..a49375dae28 100644
--- a/modules/storages/app/common/storages/adapters/providers/one_drive/one_drive_registry.rb
+++ b/modules/storages/app/common/storages/adapters/providers/one_drive/one_drive_registry.rb
@@ -32,7 +32,7 @@ module Storages
   module Adapters
     module Providers
       module OneDrive
-        OneDriveRegistry = Dry::Container::Namespace.new("one_drive") do
+        OneDriveRegistry = Dry::Core::Container::Namespace.new("one_drive") do
           namespace("authentication") do
             register(:userless, ->(use_cache = true) { Input::Strategy.build(key: :oauth_client_credentials, use_cache:) })
             register(:user_bound, ->(user, storage = nil) { Input::Strategy.build(key: :oauth_user_token, user:, storage:) })
diff --git a/modules/storages/app/common/storages/adapters/providers/sharepoint/sharepoint_registry.rb b/modules/storages/app/common/storages/adapters/providers/sharepoint/sharepoint_registry.rb
index 1e9b247bc8c..2730453c58c 100644
--- a/modules/storages/app/common/storages/adapters/providers/sharepoint/sharepoint_registry.rb
+++ b/modules/storages/app/common/storages/adapters/providers/sharepoint/sharepoint_registry.rb
@@ -32,7 +32,7 @@ module Storages
   module Adapters
     module Providers
       module Sharepoint
-        SharepointRegistry = Dry::Container::Namespace.new("sharepoint") do
+        SharepointRegistry = Dry::Core::Container::Namespace.new("sharepoint") do
           namespace("authentication") do
             register(:userless, ->(use_cache = true) { Input::Strategy.build(key: :oauth_client_credentials, use_cache:) })
             register(:user_bound, ->(user, storage = nil) { Input::Strategy.build(key: :oauth_user_token, user:, storage:) })
diff --git a/modules/storages/app/common/storages/adapters/registry.rb b/modules/storages/app/common/storages/adapters/registry.rb
index 2d247285c2d..eb7c986f422 100644
--- a/modules/storages/app/common/storages/adapters/registry.rb
+++ b/modules/storages/app/common/storages/adapters/registry.rb
@@ -28,12 +28,12 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "dry/container"
+require "dry/core/container"
 
 module Storages
   module Adapters
     class Registry
-      extend Dry::Container::Mixin
+      extend Dry::Core::Container::Mixin
 
       # Extracts the known_providers from the registered keys
       # @return [Array<String>]
@@ -41,7 +41,7 @@ module Storages
         keys.map { it.split(".").first }.uniq
       end
 
-      class Resolver < Dry::Container::Resolver
+      class Resolver < Dry::Core::Container::Resolver
         include TaggedLogging
 
         def call(container, key)
@@ -49,7 +49,7 @@ module Storages
             info "Resolving #{key}"
             super
           end
-        rescue Dry::Container::KeyError
+        rescue Dry::Core::Container::KeyError
           error = Errors.registry_error_for(key)
 
           with_tagged_logger("Storages::Adapters::Registry") { error error.message }
diff --git a/modules/storages/config/locales/crowdin/de.yml b/modules/storages/config/locales/crowdin/de.yml
index 6d5299a9ec3..90a1a9d8a00 100644
--- a/modules/storages/config/locales/crowdin/de.yml
+++ b/modules/storages/config/locales/crowdin/de.yml
@@ -333,9 +333,9 @@ de:
           nc_dependency_missing: 'Eine erforderliche Abhängigkeit fehlt auf dem Datei-Speicher. Bitte fügen Sie die folgende Abhängigkeit hinzu: %{dependency}.'
           nc_dependency_version_mismatch: Die %{dependency} App-Version wird nicht unterstützt. Bitte aktualisieren Sie Ihren Nextcloud Server.
           nc_host_not_found: Kein Nextcloud-Server unter der konfigurierten Host-URL gefunden. Bitte überprüfen Sie die Konfiguration.
-          nc_oauth_request_not_found: Der Endpunkt für den Abruf des aktuell verbundenen Benutzers wurde nicht gefunden. Bitte überprüfen Sie die Serverprotokolle für weitere Informationen.
-          nc_oauth_request_unauthorized: Der aktuelle Benutzer ist nicht berechtigt, auf den Datei-Speicher zuzugreifen. Bitte überprüfen Sie die Server-Logs für weitere Informationen.
-          nc_oauth_token_missing: OpenProject kann die Kommunikation auf Benutzerebene mit Nextcloud nicht testen, da der Benutzer sein Nextcloud Konto noch nicht verknüpft hat.
+          nc_oauth_request_not_found: Der Endpunkt zum Abrufen der aktuell verbundenen Sitzung wurde nicht gefunden. Bitte die Server-Logs auf weitere Informationen prüfen.
+          nc_oauth_request_unauthorized: Es fehlt die Berechtigung, auf den Remote-Dateispeicher zuzugreifen. Bitte die Server-Logs auf weitere Informationen prüfen.
+          nc_oauth_token_missing: OpenProject kann die Kommunikation auf Benutzerebene mit Nextcloud nicht testen, da noch kein Nextcloud-Konto verknüpft wurde.
           nc_project_folder_missing: Der zuvor erstellte Projektordner für das Projekt "%{project}" konnte nicht gefunden werden.
           nc_team_folder_not_found: Der Teamordner konnte nicht gefunden werden.
           nc_unexpected_files: 'Unerwartete Dateien im verwalteten Teamordner gefunden. Zum Beispiel: %{sample}'
@@ -346,16 +346,16 @@ de:
           od_client_write_permission_missing: Der Client hat anscheinend keine Schreibberechtigungen. Bitte überprüfen Sie die Setup-Dokumentation für Ihren Speicher.
           od_drive_id_invalid: Die konfigurierte Laufwerks-ID scheint ungültig. Bitte überprüfen Sie die Konfiguration.
           od_drive_id_not_found: Die konfigurierte Laufwerks-ID konnte nicht gefunden werden. Bitte überprüfen Sie die Konfiguration.
-          od_oauth_request_not_found: Der Endpunkt für den Abruf des aktuell verbundenen Benutzers wurde nicht gefunden. Bitte überprüfen Sie die Serverprotokolle für weitere Informationen.
-          od_oauth_request_unauthorized: Der aktuelle Benutzer ist nicht berechtigt, auf den Datei-Speicher zuzugreifen. Bitte überprüfen Sie die Server-Logs für weitere Informationen.
-          od_oauth_token_missing: OpenProject kann die Kommunikation auf Benutzerebene mit OneDrive nicht testen, da der Benutzer sein Microsoft-Konto noch nicht verknüpft hat.
+          od_oauth_request_not_found: Der Endpunkt zum Abrufen des aktuell angemeldeten Kontos wurde nicht gefunden. Bitte prüfen Sie die Server-Logs für weitere Informationen.
+          od_oauth_request_unauthorized: Das aktuell angemeldete Konto ist nicht berechtigt, auf den Remote-Dateispeicher zuzugreifen. Bitte die Server-Logs auf weitere Informationen prüfen.
+          od_oauth_token_missing: OpenProject kann die Kommunikation auf Kontoebene mit OneDrive nicht testen, da noch kein Microsoft-Konto verknüpft wurde.
           od_tenant_id_wrong: Die konfigurierte Verzeichnis-(Mandanten-)ID ist ungültig. Bitte überprüfen Sie die Konfiguration.
           od_test_folder_exists: Der für den Test benötigte Ordner %{folder_name} existiert bereits. Bitte löschen Sie ihn und versuchen Sie es erneut.
           od_unexpected_content: Unerwarteter Inhalt auf dem Laufwerk gefunden.
           offline_access_scope_missing: Es wird empfohlen, den OpenID Connect-Anbieter so zu konfigurieren, dass er den Scope offline_access anfordert. Die Integration kann trotzdem funktionieren, aber stellen Sie sicher, dass die Aktualisierungstoken nicht ablaufen.
           oidc_cant_refresh_token: Beim Versuch, Ihren Zugriff auf den Speicher zu überprüfen, ist ein Fehler aufgetreten. Bitte überprüfen Sie die Server-Protokolle auf weitere Informationen.
-          oidc_non_oidc_user: Der aktuelle Benutzer wurde zwar bereitgestellt, aber nicht von einem OpenID Connect (OIDC) Identity Provider. Bitte wiederholen Sie die Prüfung mit einem OIDC-bereitgestellten Benutzer.
-          oidc_non_provisioned_user: Der aktuelle Benutzer wird nicht von einem OpenID Connect Identity Provider bereitgestellt. Bitte führen Sie die Prüfung mit einem bereitgestellten Benutzer erneut durch.
+          oidc_non_oidc_user: Das aktuell angemeldete Konto wurde nicht über einen OpenID Connect (OIDC) Identity Provider bereitgestellt. Bitte die Prüfung mit einem über OIDC bereitgestellten Konto erneut durchführen.
+          oidc_non_provisioned_user: Das aktuell angemeldete Konto wird nicht von einem OpenID Connect Identity Provider bereitgestellt. Bitte die Prüfung mit einem bereitgestellten Konto erneut durchführen.
           oidc_provider_cant_exchange: Der OpenID Connect-Provider scheint den Token-Austausch nicht zu unterstützen, aber der Token-Austausch wurde für die Speicherung konfiguriert.
           oidc_token_acquisition_failed: Ihre OpenID-Connect-Konfiguration stellt weder die erforderliche Audience bereit, noch unterstützt sie die Token-Austausch-Funktion. Bitte lesen Sie unsere Dokumentation für weitere Informationen.
           oidc_token_exchange_failed: Es scheint ein Problem mit dem Token Exchange Setup auf Ihrem OpenID Connect Provider zu geben. Bitte überprüfen Sie die Konfiguration und versuchen Sie es erneut.
@@ -365,9 +365,9 @@ de:
           sp_client_secret_missing: Das konfigurierte OAuth 2-Client-Geheimnis fehlt für SharePoint. Bitte überprüfen Sie die Konfiguration.
           sp_client_write_permission_missing: Der Client hat anscheinend keine Schreibberechtigungen in SharePoint. Bitte überprüfen Sie die Setup-Dokumentation für Ihren Speicher.
           sp_existing_test_folder: Der für den Test benötigte Ordner %{folder_name} existiert bereits in SharePoint. Bitte löschen Sie ihn und versuchen Sie es erneut.
-          sp_oauth_request_error: Die benutzergebundene Anfrage an SharePoint ist fehlgeschlagen. Bitte prüfen Sie die Serverprotokolle für weitere Informationen.
-          sp_oauth_request_unauthorized: Der aktuelle Benutzer ist nicht berechtigt, auf den Datei-Speicher zuzugreifen. Bitte überprüfen Sie die Server-Logs für weitere Informationen.
-          sp_oauth_token_missing: OpenProject kann die Kommunikation auf Benutzerebene mit SharePoint nicht testen, da der Benutzer sein SharePoint-Konto noch nicht verknüpft hat.
+          sp_oauth_request_error: Die kontobezogene Anfrage an SharePoint ist fehlgeschlagen. Bitte die Server-Logs auf weitere Informationen prüfen.
+          sp_oauth_request_unauthorized: Das aktuell angemeldete Konto ist nicht berechtigt, auf den Remote-Dateispeicher zuzugreifen. Bitte die Server-Logs auf weitere Informationen prüfen.
+          sp_oauth_token_missing: OpenProject kann die Kommunikation auf Kontoebene mit SharePoint nicht testen, da noch kein SharePoint-Konto verknüpft wurde.
           sp_tenant_id_missing: Die konfigurierte Verzeichnis-ID (Tenant) fehlt für SharePoint. Bitte überprüfen Sie die Konfiguration.
           sp_unexpected_content: Unerwarteter Inhalt in der SharePoint-Dokumentbibliothek gefunden.
           unknown_error: Die Verbindung konnte nicht validiert werden. Es ist ein unbekannter Fehler aufgetreten. Bitte prüfen Sie die Serverprotokolle für weitere Informationen.
diff --git a/modules/storages/config/locales/crowdin/fr.yml b/modules/storages/config/locales/crowdin/fr.yml
index 3cc71043ce1..7b36997dbce 100644
--- a/modules/storages/config/locales/crowdin/fr.yml
+++ b/modules/storages/config/locales/crowdin/fr.yml
@@ -212,16 +212,16 @@ fr:
         validation_result_component:
           checks:
             failures:
-              one: "%{count} check failed"
-              other: "%{count} checks failed"
-            success: All checks passed
+              one: "%{count} vérification a échoué"
+              other: "%{count} vérifications ont échoué"
+            success: Toutes les vérifications ont été validées
             warnings:
-              one: "%{count} check returned a warning"
-              other: "%{count} checks returned a warning"
+              one: "%{count} vérification a renvoyé un avertissement"
+              other: "%{count} vérifications ont renvoyé un avertissement"
           summary:
-            failure: Some checks failed and the system does not work as expected.
-            success: All connections and systems are working as expected.
-            warning: Some checks returned a warning. This can lead to unexpected behaviour.
+            failure: Certaines vérifications ont échoué et le système ne fonctionne pas comme prévu.
+            success: Toutes les connexions et les systèmes fonctionnent comme prévu.
+            warning: Certaines vérifications ont renvoyé un avertissement. Cela peut entraîner un comportement inattendu.
     buttons:
       done_continue: Terminé, continuer
       open_storage: Ouvrir le stockage de fichiers
@@ -328,49 +328,49 @@ fr:
           storage_configured: Configuration terminée
           tenant_id: ID du tenant
         errors:
-          client_id_invalid: The configured OAuth 2 client id is invalid. Please check the configuration.
-          client_secret_invalid: The configured OAuth 2 client secret is invalid. Please check the configuration.
-          nc_dependency_missing: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.'
-          nc_dependency_version_mismatch: The %{dependency} app version is not supported. Please update your Nextcloud server.
-          nc_host_not_found: No Nextcloud server found at the configured host url. Please check the configuration.
-          nc_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
-          nc_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
-          nc_oauth_token_missing: OpenProject cannot test the user level communication with Nextcloud as the user did not yet link their Nextcloud account.
-          nc_project_folder_missing: The previously created project folder for project "%{project}" could not be found.
-          nc_team_folder_not_found: The team folder could not be found.
-          nc_unexpected_files: 'Unexpected files found in the managed team folder. For example: %{sample}'
-          nc_unlinked_project_folders: Not all project folders have been created yet (%{actual} / %{expected}). This can indicate errors during the AMPF background synchronization.
-          nc_userless_access_denied: The configured app password is invalid.
-          not_configured: The connection could not be validated. Please finish configuration first.
-          od_client_cant_delete_folder: The client is having trouble deleting folders. Please check the setup documentation for your storage.
-          od_client_write_permission_missing: The client seems to have write permissions missing. Please check the setup documentation for your storage.
-          od_drive_id_invalid: The configured drive id seems invalid. Please check the configuration.
-          od_drive_id_not_found: The configured drive id could not be found. Please check the configuration.
-          od_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
-          od_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
-          od_oauth_token_missing: OpenProject cannot test the user level communication with OneDrive as the user did not yet link their Microsoft account.
-          od_tenant_id_wrong: The configured directory (tenant) id is invalid. Please check the configuration.
-          od_test_folder_exists: The folder %{folder_name} needed for testing already exists. Please delete it and try again.
-          od_unexpected_content: Unexpected content found in the drive.
-          offline_access_scope_missing: It is recommended to configure the OpenID Connect provider to request the offline_access scope. The integration may still work anyways, but make sure that refresh tokens do not expire.
-          oidc_cant_refresh_token: There was an error while trying to check your access to the storage. Please check the server logs for further information.
-          oidc_non_oidc_user: The current user, while provisioned, wasn't provisioned by an OpenID Connect (OIDC) Identity Provider. Please re-run the check with an OIDC provisioned user.
-          oidc_non_provisioned_user: The current user isn't provided by an OpenID Connect Identity Provider. Please re-run the check with a provided user.
-          oidc_provider_cant_exchange: The OpenID Connect provider does not seem to support token exchange, but token exchange was configured for the storage.
-          oidc_token_acquisition_failed: Your OpenID Connect setup doesn't provide the necessary audience, nor does it provide token exchange capabilities. Please check out our documentation for more information.
-          oidc_token_exchange_failed: There seems to be a problem with the Token Exchange setup on your OpenID Connect Provider. Please check its configuration and try again.
-          oidc_token_refresh_failed: There was an error while trying to check your access to the storage. Please check the server logs for further information.
-          sp_client_cant_delete_folder: The client is having trouble deleting folders in SharePoint. Please check the setup documentation for your storage.
-          sp_client_id_missing: The configured OAuth 2 client id is missing for SharePoint. Please check the configuration.
-          sp_client_secret_missing: The configured OAuth 2 client secret is missing for SharePoint. Please check the configuration.
-          sp_client_write_permission_missing: The client seems to have write permissions missing in SharePoint. Please check the setup documentation for your storage.
-          sp_existing_test_folder: The folder %{folder_name} needed for testing already exists in SharePoint. Please delete it and try again.
-          sp_oauth_request_error: The user-bound request to SharePoint failed. Please check the server logs for further information.
-          sp_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
-          sp_oauth_token_missing: OpenProject cannot test the user level communication with SharePoint as the user did not yet link their SharePoint account.
-          sp_tenant_id_missing: The configured directory (tenant) id is missing for SharePoint. Please check the configuration.
-          sp_unexpected_content: Unexpected content found in the SharePoint Document Library.
-          unknown_error: The connection could not be validated. An unknown error occurred. Please check the server logs for further information.
+          client_id_invalid: L'identifiant du client OAuth 2 configuré n'est pas valide. Veuillez vérifier la configuration.
+          client_secret_invalid: La clé secrète du client OAuth 2 configurée n'est pas valable. Veuillez vérifier la configuration.
+          nc_dependency_missing: 'Une dépendance requise est manquante dans l''espace de stockage de fichiers. Veuillez ajouter la dépendance suivante : %{dependency}.'
+          nc_dependency_version_mismatch: La version de l'application %{dependency} n'est pas prise en charge. Veuillez mettre à jour votre serveur Nextcloud.
+          nc_host_not_found: Aucun serveur Nextcloud n'a été trouvé à l'adresse configurée. Veuillez vérifier la configuration.
+          nc_oauth_request_not_found: Le point de terminaison pour récupérer l'utilisateur actuellement connecté n'a pas été trouvé. Veuillez vérifier les journaux du serveur pour obtenir plus d'informations.
+          nc_oauth_request_unauthorized: L'utilisateur actuel n'est pas autorisé à accéder à l'espace de stockage de fichiers distant. Veuillez consulter les journaux du serveur pour obtenir plus d'informations.
+          nc_oauth_token_missing: OpenProject ne peut pas tester la communication au niveau utilisateur avec Nextcloud, car l'utilisateur n'a pas encore lié son compte Nextcloud.
+          nc_project_folder_missing: Le dossier de projet précédemment créé pour le projet « %{project} » est introuvable.
+          nc_team_folder_not_found: Le dossier de l'équipe est introuvable.
+          nc_unexpected_files: 'Fichiers inattendus trouvés dans le dossier de l''équipe gérée. Par exemple : %{sample}'
+          nc_unlinked_project_folders: Tous les dossiers de projet n'ont pas encore été créés (%{actual}/%{expected}). Cela peut indiquer des erreurs lors de la synchronisation en arrière-plan de l'AMPF.
+          nc_userless_access_denied: Le mot de passe de l'application configurée n'est pas valide.
+          not_configured: La connexion n'a pas pu être validée. Veuillez d'abord terminer la configuration.
+          od_client_cant_delete_folder: Le client rencontre des difficultés pour supprimer des dossiers. Veuillez consulter la documentation d'installation de votre espace de stockage.
+          od_client_write_permission_missing: Le client semble ne pas avoir les autorisations d'écriture. Veuillez vérifier la documentation d'installation de votre espace de stockage.
+          od_drive_id_invalid: L'identifiant du lecteur configuré ne semble pas valide. Veuillez vérifier la configuration.
+          od_drive_id_not_found: L'identifiant du lecteur configuré est introuvable. Veuillez vérifier la configuration.
+          od_oauth_request_not_found: Le point de terminaison pour récupérer l'utilisateur actuellement connecté n'a pas été trouvé. Veuillez vérifier les journaux du serveur pour obtenir plus d'informations.
+          od_oauth_request_unauthorized: L'utilisateur actuel n'est pas autorisé à accéder à l'espace de stockage de fichiers distant. Veuillez consulter les journaux du serveur pour obtenir plus d'informations.
+          od_oauth_token_missing: OpenProject ne peut pas tester la communication au niveau utilisateur avec OneDrive, car l'utilisateur n'a pas encore lié son compte Microsoft.
+          od_tenant_id_wrong: L'identifiant du répertoire (locataire) configuré n'est pas valide. Veuillez vérifier la configuration.
+          od_test_folder_exists: Le dossier %{folder_name} requis pour le test existe déjà. Veuillez le supprimer et réessayer.
+          od_unexpected_content: Contenu inattendu trouvé dans le lecteur.
+          offline_access_scope_missing: Il est recommandé de configurer le fournisseur OpenID Connect pour demander la portée offline_access. L'intégration peut néanmoins fonctionner, mais assurez-vous que les jetons d'actualisation n'expirent pas.
+          oidc_cant_refresh_token: Une erreur s'est produite lors de la vérification de votre accès à l'espace de stockage. Veuillez consulter les journaux du serveur pour obtenir plus d'informations.
+          oidc_non_oidc_user: L'utilisateur actuel, même s'il est provisionné, n'a pas été provisionné par un fournisseur d'identité OpenID Connect (OIDC). Veuillez refaire la vérification avec un utilisateur OIDC provisionné.
+          oidc_non_provisioned_user: L'utilisateur actuel n'est pas fourni par un fournisseur d'identité OpenID Connect. Veuillez réexécuter la vérification avec un utilisateur fourni.
+          oidc_provider_cant_exchange: Le fournisseur OpenID Connect ne semble pas prendre en charge l'échange de jetons, mais l'échange de jetons a été configuré pour le stockage.
+          oidc_token_acquisition_failed: Votre configuration OpenID Connect ne fournit pas l'audience nécessaire, ni les capacités d'échange de jetons. Veuillez consulter notre documentation pour obtenir plus d'informations.
+          oidc_token_exchange_failed: Il semble y avoir un problème avec la configuration de l'échange de jetons sur votre fournisseur OpenID Connect. Veuillez vérifier sa configuration et réessayer.
+          oidc_token_refresh_failed: Une erreur s'est produite lors de la vérification de votre accès à l'espace de stockage. Veuillez consulter les journaux du serveur pour obtenir plus d'informations.
+          sp_client_cant_delete_folder: Le client rencontre des difficultés pour supprimer des dossiers. Veuillez consulter la documentation d'installation de votre espace de stockage.
+          sp_client_id_missing: L'identifiant du client OAuth 2 configuré est manquant pour SharePoint. Veuillez vérifier la configuration.
+          sp_client_secret_missing: Le secret du client OAuth 2 configuré est manquant pour SharePoint. Veuillez vérifier la configuration.
+          sp_client_write_permission_missing: Le client semble avoir des autorisations d'écriture manquantes dans SharePoint. Veuillez vérifier la documentation de configuration de votre espace de stockage.
+          sp_existing_test_folder: Le dossier %{folder_name} requis pour le test existe déjà dans SharePoint. Veuillez le supprimer et réessayer.
+          sp_oauth_request_error: La requête liée à l'utilisateur vers SharePoint a échoué. Veuillez consulter les journaux du serveur pour obtenir plus d'informations.
+          sp_oauth_request_unauthorized: L'utilisateur actuel n'est pas autorisé à accéder à l'espace de stockage de fichiers distant. Veuillez consulter les journaux du serveur pour obtenir plus d'informations.
+          sp_oauth_token_missing: OpenProject ne peut pas tester la communication au niveau de l'utilisateur avec SharePoint, car l'utilisateur n'a pas encore lié son compte SharePoint.
+          sp_tenant_id_missing: L'identifiant du répertoire (locataire) configuré est manquant pour SharePoint. Veuillez vérifier la configuration.
+          sp_unexpected_content: Contenu inattendu trouvé dans la bibliothèque de documents SharePoint.
+          unknown_error: La connexion n'a pas pu être validée. Une erreur inconnue s'est produite. Veuillez consulter les journaux du serveur pour en savoir plus.
       label_error: Erreur
       label_healthy: Sain
       label_pending: En attente
diff --git a/modules/storages/config/locales/crowdin/hy.yml b/modules/storages/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..1cbcee91abd
--- /dev/null
+++ b/modules/storages/config/locales/crowdin/hy.yml
@@ -0,0 +1,570 @@
+---
+hy:
+  activerecord:
+    attributes:
+      oauth_client:
+        client_id: Client ID
+        client_secret: Client secret
+      project:
+        project_folder_type: Project folder type
+      storages/file_link:
+        origin: Origin
+        storage: Storage
+      storages/nextcloud_storage:
+        authentication_methods:
+          oauth2_sso: Single-Sign-On through OpenID Connect Identity Provider
+          oauth2_sso_with_two_way_oauth2_fallback: Single-Sign-On with Two-Way OAuth 2.0 as fallback
+          two_way_oauth2: Two-way OAuth 2.0 authorization code flow
+        storage_audience: Storage Audience
+        token_exchange_scope: Storage Scope
+      storages/project_storage:
+        project_folder: Project folder
+        project_folder_mode: Project folder mode
+        storage: Storage
+        storage_url: Storage URL
+      storages/sharepoint_storage:
+        host: Sharepoint Site URL
+        library: Library ID
+        name: Name
+        site: Site ID
+      storages/storage:
+        authentication_method: Authentication Method
+        creator: Creator
+        drive: Drive ID
+        host: Host
+        name: Name
+        password: Application password
+        provider_type: Provider type
+        tenant: Directory (tenant) ID
+    errors:
+      messages:
+        invalid_host_url: is not a valid URL.
+        invalid_sharepoint_url: is not a valid SharePoint site, library, or document URL.
+        not_linked_to_project: is not linked to project.
+      models:
+        storages/file_link:
+          attributes:
+            origin_id:
+              only_numeric_or_uuid: can only be numeric or uuid.
+        storages/project_storage:
+          attributes:
+            project_folder_id:
+              blank: Please select a folder.
+            project_folder_mode:
+              mode_unavailable: is not available for this storage.
+            project_ids:
+              blank: Please select a project.
+        storages/storage:
+          attributes:
+            host:
+              authorization_header_missing: is not fully set up. The Nextcloud instance does not receive the "Authorization" header, which is necessary for a Bearer token based authorization of API requests. Please double check your HTTP server configuration.
+              cannot_be_connected_to: could not be reached. Please ensure the host is reachable and the OpenProject integration app is installed.
+              minimal_nextcloud_version_unmet: does not meet minimal version requirements (must be Nextcloud 23 or higher)
+              not_nextcloud_server: is not a Nextcloud server
+              op_application_not_installed: appears to not have the app "OpenProject integration" installed. Please install it first and then try again.
+            password:
+              invalid_password: is not valid.
+              unknown_error: could not be validated with the file storage provider. Please verify that the connection is functioning properly.
+    models:
+      file_link: File
+      storages/storage: Storage
+  api_v3:
+    errors:
+      too_many_elements_created_at_once: Too many elements created at once. Expected %{max} at most, got %{actual}.
+  external_file_storages: External file storages
+  permission_create_files: 'Automatically managed project folders: Create files'
+  permission_create_files_explanation: This permission is only available for Nextcloud storages
+  permission_delete_files: 'Automatically managed project folders: Delete files'
+  permission_delete_files_explanation: This permission is only available for Nextcloud storages
+  permission_header_for_project_module_storages: Automatically managed project folders
+  permission_manage_file_links: Manage file links
+  permission_manage_files_in_project: Manage files in project
+  permission_read_files: 'Automatically managed project folders: Read files'
+  permission_share_files: 'Automatically managed project folders: Share files'
+  permission_share_files_explanation: This permission is only available for Nextcloud storages
+  permission_view_file_links: View file links
+  permission_write_files: 'Automatically managed project folders: Write files'
+  project_module_storages: Files
+  project_storages:
+    edit_project_folder:
+      label: Edit project folder
+    open:
+      contact_admin: Please contact your administrator to resolve this error.
+      remote_identity_error: An unexpected error occurred while connecting to the storage.
+    project_folder_mode:
+      automatic: Automatically managed
+      inactive: No specific folder
+      manual: Existing folder manually managed
+    remove_project:
+      deletion_failure_flash: Failed to remove the project from the storage. %{error}
+      label: Remove project
+  services:
+    attributes:
+      nextcloud_sync_service:
+        add_user_to_group: 'Add User to Group:'
+        create_folder: 'Managed Project Folder Creation:'
+        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
+        hide_inactive_folders: 'Hide Inactive Folders Step:'
+        remote_folders: 'Read contents of the team folder:'
+        remove_user_from_group: 'Remove User from Group:'
+        rename_project_folder: 'Rename managed project Folder:'
+      one_drive_sync_service:
+        create_folder: 'Managed Project Folder Creation:'
+        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
+        hide_inactive_folders: 'Hide Inactive Folders Step:'
+        remote_folders: 'Read contents of the drive root folder:'
+        rename_project_folder: 'Rename managed project Folder:'
+      sharepoint_sync_service:
+        create_folder: 'Managed Project Folder Creation:'
+        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
+        hide_inactive_folders: 'Hide Inactive Folders Step:'
+        remote_folders: 'Read contents of the drive root folder:'
+        rename_project_folder: 'Rename managed project Folder:'
+    errors:
+      messages:
+        error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
+        forbidden: OpenProject could not access the requested resource. Please check your permissions configuration on the Storage Provider.
+        unauthorized: OpenProject could not authenticate with the Storage Provider. Please ensure that you have access to it.
+      models:
+        copy_project_folders_service:
+          conflict: The folder %{destination_path} already exists. Interrupting process to avoid overwrites.
+          error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
+          forbidden: OpenProject could not access the source folder. Please check your permissions configuration on the Storage Provider
+          not_found: The source template location %{source_path} wasn't found.
+          unauthorized: OpenProject could not authenticate with the Storage Provider. Please check your storage configuration
+        nextcloud_sync_service:
+          attributes:
+            add_user_to_group:
+              conflict: 'The user %{user} could not be added to the %{group} group for the following reason: %{reason}'
+              failed_to_add: 'The user %{user} could not be added to the %{group} group for the following reason: %{reason}'
+            create_folder:
+              conflict: The folder %{folder_name} already exists on %{parent_location}.
+              not_found: "%{parent_location} wasn't found."
+            ensure_root_folder_permissions:
+              not_found: "%{group_folder} wasn't found. Please check your Nextcloud Team Folder setup."
+              permission_not_set: could not set permissions on %{group_folder}.
+            hide_inactive_folders:
+              permission_not_set: could not set permissions on %{path}.
+            remote_folders:
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
+              not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
+            remove_user_from_group:
+              conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
+              failed_to_remove: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
+            rename_project_folder:
+              conflict: OpenProject could not rename the project folder to %{current_path} as a folder with the same name already exists
+              forbidden: OpenProject user does not have access to %{current_path} folder.
+              not_found: "%{current_path} wasn't found."
+            set_folders_permissions:
+              permission_not_set: could not set permissions on %{path}.
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
+          group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
+          insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
+          not_allowed: Nextcloud block the request.
+          not_found: OpenProject could not find the file on the Nextcloud Storage Provider. Please check if it wasn't deleted.
+          unauthorized: OpenProject could not sync with Nextcloud. Please check your storage and Nextcloud configuration.
+          user_does_not_exist: "%{user} does not exist in Nextcloud."
+        one_drive_sync_service:
+          attributes:
+            create_folder:
+              conflict: The %{folder_name} already exists on %{parent_location}.
+              not_found: "%{parent_location} wasn't found."
+            hide_inactive_folders:
+              permission_not_set: could not set permissions on %{path}.
+            remote_folders:
+              request_error: OpenProject could not access your drive %{drive_id}. Please check if your storage configuration is correct.
+            rename_project_folder:
+              conflict: OpenProject could not rename the folder %{current_path} to %{project_folder_name} as a folder with the same name already exists.
+              forbidden: OpenProject does not have access to %{current_path} in order to rename it.
+              not_found: "%{current_path} wasn't found."
+            set_folders_permissions:
+              permission_not_set: could not set permissions on %{path}.
+          error: An unexpected error occurred. Please ensure that OneDrive is reachable and check OpenProject worker logs for more information.
+          not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
+          unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
+          user_does_not_exist: "%{user} does not exist in Nextcloud."
+        sharepoint_sync_service:
+          attributes:
+            create_folder:
+              conflict: The %{folder_name} already exists on %{parent_location}.
+              not_found: "%{parent_location} wasn't found."
+            hide_inactive_folders:
+              permission_not_set: could not set permissions on %{path}.
+            rename_project_folder:
+              conflict: OpenProject could not rename the folder %{current_path} to %{project_folder_name} as a folder with the same name already exists
+              forbidden: OpenProject does not have access to %{current_path} in order to rename it.
+              not_found: "%{current_path} wasn't found."
+            set_folders_permissions:
+              permission_not_set: could not set permissions on %{path}.
+          error: An unexpected error occurred. Please ensure that OneDrive is reachable and check OpenProject worker logs for more information
+          not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
+          not_found: OpenProject could not access your library %{drive_name}. Please check you Sharepoint site document libraries.
+          unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
+          user_does_not_exist: "%{user} does not exist in Nextcloud."
+        upload_link_service:
+          not_found: The destination folder %{folder} could not be found on %{storage_name}.
+  storages:
+    admin:
+      side_panel:
+        health_notifications_component:
+          sync_now: Sync now
+          sync_queued: Synchronization queued.
+        validation_result_component:
+          checks:
+            failures:
+              one: "%{count} check failed"
+              other: "%{count} checks failed"
+            success: All checks passed
+            warnings:
+              one: "%{count} check returned a warning"
+              other: "%{count} checks returned a warning"
+          summary:
+            failure: Some checks failed and the system does not work as expected.
+            success: All connections and systems are working as expected.
+            warning: Some checks returned a warning. This can lead to unexpected behaviour.
+    buttons:
+      done_continue: Done, continue
+      open_storage: Open file storage
+      replace_oauth_application: Replace OpenProject OAuth
+      replace_oauth_client: Replace %{provider_type} OAuth
+      save_and_continue: Save and continue
+      select_folder: Select folder
+    configuration_checks:
+      oauth_client_incomplete:
+        nextcloud: Allow OpenProject to access Nextcloud data using OAuth.
+        one_drive: Allow OpenProject to access Azure data using OAuth to connect OneDrive.
+        sharepoint: Allow OpenProject to access SharePoint data using OAuth.
+      redirect_uri_incomplete:
+        one_drive: Complete the setup with the correct URI redirection.
+        sharepoint: Complete the setup with the correct URI redirection.
+    confirm_replace_oauth_application: This action will reset the current OAuth credentials. After confirming you will have to reenter the credentials at the storage provider and all remote users will have to authorize against OpenProject again. Are you sure you want to proceed?
+    confirm_replace_oauth_client: This action will reset the current OAuth credentials. After confirming you will have to enter new credentials from the storage provider and all users will have to authorize against %{provider_type} again. Are you sure you want to proceed?
+    delete_warning:
+      project_storage_delete_result_1: All links to corresponding files and folders will be removed
+      project_storage_delete_result_2: The automatically-managed project folder and all files in it will be deleted
+      project_storage_html: Are you sure you want to remove %{file_storage} from this project?
+      storage_delete_result_1: The storage will be removed from all projects currently using it
+      storage_delete_result_2: All links to corresponding files and folders will be removed
+      storage_delete_result_3: The automatically-managed project folder and all files in it will be deleted
+      storage_html: Are you sure you want to delete %{file_storage} as an external file storage?
+    dependencies:
+      nextcloud:
+        group_folders_app: Team Folders
+        integration_app: Integration OpenProject
+    enabled_in_projects:
+      setup_incomplete_description: This storage has an incomplete setup. Please, complete the setup before enabling it in multiple projects.
+      setup_incomplete_header: Storage setup incomplete
+    error_invalid_provider_type: Please select a valid storage provider.
+    file_storage_view:
+      access_management:
+        automatic_management: Enable automatically-managed access and folders
+        automatic_management_description: Each project will be able to decide, when a storage is added to it, whether they want the automatically-managed or the manual approach to folder and access management.
+        description: OpenProject can automatically create and manage project folders when a file storage is added to a project. This can result in a more organized folder structure and straightforward access management that guarantees access to all relevant users.
+        manual_management: Only allow manually-managed access and folders
+        manual_management_description: Projects using this storage will not be offered the option of the automatically-managed approach. Folders and access must be managed manually.
+        setup_incomplete: Select the type of management of user access and folder creation.
+        subtitle: Folder and access management
+      access_management_section: Access and project folders
+      automatically_managed_folders: Automatically managed folders
+      general_information: General information
+      oauth_configuration: OAuth configuration
+      one_drive:
+        access_management:
+          automatic_management: Enable automatically-managed access and folders
+          automatic_management_description: Each project using this file storage will necessarily have to use the automatically-managed approach to folder and access management. They cannot do it manually.
+          manual_management: Only allow manually-managed access and folders
+          manual_management_description: Projects using this storage will not be offered the option of the automatically-managed approach. Folders and access must be managed manually.
+      one_drive_oauth: Azure OAuth
+      openproject_oauth: OpenProject OAuth
+      project_folders: Project folders
+      redirect_uri: Redirect URI
+      sharepoint_oauth: Azure OAuth
+      storage_audience_blank: No audience has been configured.
+      storage_audience_description: Exchanging tokens for audience "%{audience}".
+      storage_audience_idp: Using access token obtained by identity provider during login, regardless of audience.
+      storage_oauth: Storage OAuth
+      storage_provider: Storage provider
+      token_exchange: Token Exchange
+    health:
+      actions:
+        download_report: Download
+        rerun_checks: Re-run all checks
+        run_checks: Run checks now
+      checked: 'Last check: %{datetime}'
+      checks:
+        ampf_configuration:
+          client_folder_creation: Automatic folder creation
+          client_folder_removal: Automatic folder deletion
+          drive_contents: Drive content
+          files_request: Fetching team folder files
+          header: Automatically managed project folders
+          project_folders_exist: Project folders exist
+          project_folders_linked: Project folders linked
+          team_folder_app: 'Dependency: Team Folders'
+          team_folder_contents: Team folder content
+          team_folder_presence: Team folder exists
+          userless_access: Server-side request authentication
+        authentication:
+          existing_token: User token
+          header: Authentication
+          non_provisioned_user: User provisioned by IDP
+          offline_access: Configured OIDC offline_access scope
+          provider_capabilities: Provider capabilities
+          provisioned_user_provider: User provisioned by OIDC
+          token_negotiable: User token capabilities
+          user_bound_request: User-based request authentication
+        base_configuration:
+          capabilities_request: Remote file storage capabilities
+          client_id: Client ID
+          client_secret: Client secret
+          dependencies_check: Dependencies
+          dependencies_versions: Dependencies (version)
+          diagnostic_request: Diagnostic request
+          drive_id_exists: Drive exists
+          drive_id_format: Drive ID format
+          header: Configuration
+          host: Host URL
+          host_url_accessible: Host URL accessible
+          storage_configured: Configuration complete
+          tenant_id: Tenant ID
+        errors:
+          client_id_invalid: The configured OAuth 2 client id is invalid. Please check the configuration.
+          client_secret_invalid: The configured OAuth 2 client secret is invalid. Please check the configuration.
+          nc_dependency_missing: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.'
+          nc_dependency_version_mismatch: The %{dependency} app version is not supported. Please update your Nextcloud server.
+          nc_host_not_found: No Nextcloud server found at the configured host url. Please check the configuration.
+          nc_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
+          nc_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
+          nc_oauth_token_missing: OpenProject cannot test the user level communication with Nextcloud as the user did not yet link their Nextcloud account.
+          nc_project_folder_missing: The previously created project folder for project "%{project}" could not be found.
+          nc_team_folder_not_found: The team folder could not be found.
+          nc_unexpected_files: 'Unexpected files found in the managed team folder. For example: %{sample}'
+          nc_unlinked_project_folders: Not all project folders have been created yet (%{actual} / %{expected}). This can indicate errors during the AMPF background synchronization.
+          nc_userless_access_denied: The configured app password is invalid.
+          not_configured: The connection could not be validated. Please finish configuration first.
+          od_client_cant_delete_folder: The client is having trouble deleting folders. Please check the setup documentation for your storage.
+          od_client_write_permission_missing: The client seems to have write permissions missing. Please check the setup documentation for your storage.
+          od_drive_id_invalid: The configured drive id seems invalid. Please check the configuration.
+          od_drive_id_not_found: The configured drive id could not be found. Please check the configuration.
+          od_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
+          od_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
+          od_oauth_token_missing: OpenProject cannot test the user level communication with OneDrive as the user did not yet link their Microsoft account.
+          od_tenant_id_wrong: The configured directory (tenant) id is invalid. Please check the configuration.
+          od_test_folder_exists: The folder %{folder_name} needed for testing already exists. Please delete it and try again.
+          od_unexpected_content: Unexpected content found in the drive.
+          offline_access_scope_missing: It is recommended to configure the OpenID Connect provider to request the offline_access scope. The integration may still work anyways, but make sure that refresh tokens do not expire.
+          oidc_cant_refresh_token: There was an error while trying to check your access to the storage. Please check the server logs for further information.
+          oidc_non_oidc_user: The current user, while provisioned, wasn't provisioned by an OpenID Connect (OIDC) Identity Provider. Please re-run the check with an OIDC provisioned user.
+          oidc_non_provisioned_user: The current user isn't provided by an OpenID Connect Identity Provider. Please re-run the check with a provided user.
+          oidc_provider_cant_exchange: The OpenID Connect provider does not seem to support token exchange, but token exchange was configured for the storage.
+          oidc_token_acquisition_failed: Your OpenID Connect setup doesn't provide the necessary audience, nor does it provide token exchange capabilities. Please check out our documentation for more information.
+          oidc_token_exchange_failed: There seems to be a problem with the Token Exchange setup on your OpenID Connect Provider. Please check its configuration and try again.
+          oidc_token_refresh_failed: There was an error while trying to check your access to the storage. Please check the server logs for further information.
+          sp_client_cant_delete_folder: The client is having trouble deleting folders in SharePoint. Please check the setup documentation for your storage.
+          sp_client_id_missing: The configured OAuth 2 client id is missing for SharePoint. Please check the configuration.
+          sp_client_secret_missing: The configured OAuth 2 client secret is missing for SharePoint. Please check the configuration.
+          sp_client_write_permission_missing: The client seems to have write permissions missing in SharePoint. Please check the setup documentation for your storage.
+          sp_existing_test_folder: The folder %{folder_name} needed for testing already exists in SharePoint. Please delete it and try again.
+          sp_oauth_request_error: The user-bound request to SharePoint failed. Please check the server logs for further information.
+          sp_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
+          sp_oauth_token_missing: OpenProject cannot test the user level communication with SharePoint as the user did not yet link their SharePoint account.
+          sp_tenant_id_missing: The configured directory (tenant) id is missing for SharePoint. Please check the configuration.
+          sp_unexpected_content: Unexpected content found in the SharePoint Document Library.
+          unknown_error: The connection could not be validated. An unknown error occurred. Please check the server logs for further information.
+      label_error: Error
+      label_healthy: Healthy
+      label_pending: Pending
+      no_report: No report available
+      no_report_description: Run the checks now for a full health status report for this file storage.
+      open_report: Open full health report
+      project_folders:
+        subtitle: Automatically managed project folders
+      since: since %{datetime}
+      synced: 'Last sync: %{datetime}'
+      title: Health status report
+    health_email_notifications:
+      description_disabled: Admins will not receive updates by email when there are important updates.
+      description_enabled: Admins will receive updates by email when there are important updates.
+      error_could_not_be_saved: Email notification settings could not be saved. Please try again.
+      title: Email updates to admins
+    help_texts:
+      project_folder: The project folder is the default folder for file uploads for this project. Users can nevertheless still upload files to other locations.
+      project_folder_bulk: The project folder is the default folder for file uploads for all the projects selected. You can modify this individually in each project settings. Users can nevertheless still upload files to other locations.
+    instructions:
+      all_available_storages_already_added: All available storages are already added to the project.
+      authentication_method: The way that requests between OpenProject and the Storage are authenticated.
+      automatic_folder: This will automatically create a root folder for this project and manage the access permissions for each project member.
+      empty_project_folder_validation: Selecting a folder is mandatory to proceed.
+      existing_manual_folder: You can designate an existing folder as the root folder for this project. The permissions are however not automatically managed, the administrator needs to manually ensure relevant users have access. The selected folder can be used by multiple projects.
+      host: Please add the host address of your storage including the https://. It should not be longer than 255 characters.
+      managed_project_folders_application_password_caption: 'Enable automatic managed folders by copying this value from: %{provider_type_link}.'
+      name: Give your storage a name so that users can differentiate between multiple storages.
+      new_storage_html: Read our documentation on [setting up a %{provider_name} file storage](docs_url) integration for more information.
+      nextcloud:
+        application_link_text: application “Integration OpenProject”
+        integration: Nextcloud Administration / OpenProject
+        oauth_configuration: Copy these values from %{application_link_text}.
+        provider_configuration: Please make sure you have administration privileges in your Nextcloud instance and the %{application_link_text} is installed before doing the setup.
+        storage_audience: The client ID that the Nextcloud instance uses to communicate with the identity provider.
+        storage_audience_placeholder: e.g. nextcloud
+        token_exchange_scope: The scopes that should be requested during token exchange, each one separated by a space.
+      no_specific_folder: By default, each user will start at their own home folder when they upload a file.
+      no_storage_set_up: There are no file storages set up yet.
+      not_logged_into_storage: To select a project folder, please first login
+      oauth_application_details_html: The client secret value will not be accessible again after you close this window. Please copy these values into the [Nextcloud OpenProject Integration settings](oauth_application_details_link).
+      one_drive:
+        application_link_text: Azure portal
+        copy_redirect_uri: Copy redirect URI
+        documentation_link_text: OneDrive file storages documentation
+        drive_id: Please copy the ID from the desired drive by following the steps in the %{drive_id_link_text}.
+        integration: OneDrive
+        missing_client_id_for_redirect_uri: Please fill the OAuth values to generate a URI
+        oauth_client_redirect_uri: Please copy this value to a new Web redirect URI under Redirect URIs.
+        oauth_client_secret: In case there is no application client secret under Client credentials, please create a new one.
+        oauth_configuration: Copy these values from the desired application in the %{application_link_text}.
+        provider_configuration: Please make sure you have administration privileges in the %{application_link_text} or contact your Microsoft administrator before doing the setup. In the portal, you also need to register an Azure application or use an existing one for authentication.
+        tenant_id: Please copy the Directory (tenant) ID from the desired application and App registrations in the %{application_link_text}.
+        tenant_id_placeholder: Name or UUID
+      setting_up_additional_storages: For setting up additional file storages, please visit
+      setting_up_additional_storages_non_admin: Administrators can set up additional file storages in Administration / File storages.
+      setting_up_storages: For setting up file storages, please visit
+      setting_up_storages_non_admin: Administrators can set up file storages in Administration / File storages.
+      sharepoint:
+        application_link_text: SharePoint site
+        integration: SharePoint Administration / OpenProject
+        oauth_configuration: Copy these values from the desired application in the %{application_link_text}.
+        provider_configuration: Please make sure you have administration privileges in the %{application_link_text} or contact your Microsoft administrator before doing the setup. In the portal, you also need to register an Azure application or use an existing one for authentication.
+      type: 'Please make sure you have administration privileges in your Nextcloud instance and have the following application installed before doing the setup:'
+      type_link_text: "“Integration OpenProject”"
+    label_active: Active
+    label_add_new_storage: Add new storage
+    label_automatic_folder: New folder with automatically managed permissions
+    label_creation_time: Creation time
+    label_creator: Creator
+    label_delete_storage: Delete storage
+    label_edit_storage_access_management: Edit storage access management
+    label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
+    label_edit_storage_host: Edit storage host
+    label_edit_token_exchange: Edit token exchange configuration
+    label_existing_manual_folder: Existing folder with manually managed permissions
+    label_file_storage: File storage
+    label_host: Host URL
+    label_inactive: Inactive
+    label_managed_project_folders:
+      application_password: Application password
+      automatically_managed_folders: Automatically managed folders
+    label_name: Name
+    label_new_file_storage: New %{provider} storage
+    label_new_storage: New storage
+    label_no_selected_folder: No selected folder
+    label_no_specific_folder: No specific folder
+    label_oauth_client_id: OAuth Client ID
+    label_openproject_oauth_application_id: OpenProject OAuth Client ID
+    label_openproject_oauth_application_secret: OpenProject OAuth Client Secret
+    label_project_folder: Project folder
+    label_provider: Provider
+    label_redirect_uri: Redirect URI
+    label_show_storage_redirect_uri: Show redirect URI
+    label_status: Status
+    label_storage: Storage
+    label_uri: URI
+    member_connection_status:
+      connected: Connected
+      connected_no_permissions: User role has no storages permissions
+      not_connectable: Not connectable. The storage requires login through an SSO provider, but the user is not logging in through SSO.
+      not_connected: Not connected. The user should login to the storage via the following %{link}.
+      not_connected_sso: Not yet connected, SSO should automatically connect them, once looking at files.
+    members_no_results: No members to display.
+    no_results: No storages set up yet.
+    oauth_access_granted_modal:
+      access_granted: Access granted
+      project_settings:
+        access_granted_screen_reader: Access granted. You are now ready to use %{storage}
+        storage_ready: You are now ready to use %{storage}
+      storage_admin:
+        access_granted_screen_reader: Access granted. You are now ready to add projects to %{storage}
+        storage_ready: You are now ready to add projects to %{storage}
+    oauth_grant_nudge_modal:
+      cancel_button_label: I will do it later
+      heading: Login to %{provider_type} required
+      login_button_aria_label: Login to %{storage}
+      login_button_label: "%{provider_type} log in"
+      project_settings:
+        description: To get access to the project folder you need to login to %{storage}.
+      requesting_access_to: Requesting access to %{storage}
+      storage_admin:
+        description: In order to add projects to this storage you need to be logged into %{provider_type}. Please, log in and try again.
+    open_project_storage_modal:
+      success:
+        subtitle: You are being redirected
+        title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
+      waiting:
+        subtitle: One moment please, this might take some time...
+        title: We are setting up your permissions on the project folder.
+    page_titles:
+      file_storages:
+        delete: Delete file storage?
+        subtitle: Add an external file storage in order to upload, link and manage files in work packages.
+      managed_project_folders:
+        subtitle: |-
+          Let OpenProject create folders per project automatically. This is recommended as it ensures that every team
+          member always has the correct access permissions.
+        subtitle_short: Let OpenProject create folders per project automatically.
+        title: Automatically managed project folders
+      project_settings:
+        edit: Edit the file storage to this project
+        members_connection_status: Members connection status
+        new: Add a file storage to this project
+      project_storage_members:
+        subtitle_html: Check the connection status for the storage %{storage_name_link} of all project members.
+        title: Members connection status
+      project_storages:
+        delete: Remove file storage from project?
+    permission_header_explanation: File permissions on external storages are applied only to folders and files within automatically managed project folders. Note that not all file permissions are supported by all storage providers. Please check the documentation on <a target='_blank' href='https://www.openproject.org/docs/system-admin-guide/users-permissions/roles-permissions/#file-storages-permissions'>file storage permissions</a> for more information.
+    provider_types:
+      label: Provider type
+      nextcloud:
+        label_oauth_client_id: Nextcloud OAuth Client ID
+        label_oauth_client_secret: Nextcloud OAuth Client Secret
+        name: Nextcloud
+        name_placeholder: e.g. Nextcloud
+      one_drive:
+        label_oauth_client_id: Azure OAuth Application (client) ID
+        label_oauth_client_secret: Azure OAuth Client Secret Value
+        name: OneDrive
+        name_placeholder: e.g. OneDrive
+      sharepoint:
+        drive_description: OpenProject access-managed document library
+        label_oauth_client_id: Azure OAuth Application (client) ID
+        label_oauth_client_secret: Azure OAuth Client Secret Value
+        name: SharePoint
+        name_placeholder: e.g. SharePoint
+    show_attachments_toggle:
+      description: Deactivating this option will hide the attachments list on the work packages files tab. The files attached in the description of a work package will still be uploaded in the internal attachments storage.
+      label: Show attachments in the work packages files tab
+    storage_audience:
+      documentation_intro: Please read our documentation for details on the following options and configuration of the identity provider.
+      idp:
+        helptext: OpenProject will use the access token received by the identity provider during log in to authenticate requests to the storage. It will not try to obtain another token.
+        label: Use access token obtained during user log in
+      manual:
+        helptext: OpenProject will exchange a token with the identity provider for the given audience.
+        label: Manually specify audience for which to exchange access token (Recommended)
+    storage_list_blank_slate:
+      description: Add a storage to see them here.
+      heading: You don't have any storages yet.
+    successful_storage_connection: Storage connected successfully! Remember to activate the storage in the Projects tab for each desired project to use it.
+    upsell:
+      one_drive:
+        description: |-
+          Integrate your OneDrive drive as a file storage with OpenProject. Upload files and link them directly to
+          work packages in a project.
+        title: OneDrive integration
+      sharepoint:
+        description: |-
+          Integrate your SharePoint site as a file storage with OpenProject. Upload files and link them directly to
+          work packages in a project.
+        title: SharePoint integration
diff --git a/modules/storages/config/locales/crowdin/js-hy.yml b/modules/storages/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..f8ec7a43990
--- /dev/null
+++ b/modules/storages/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,108 @@
+#English strings go here
+---
+hy:
+  js:
+    storages:
+      authentication_error: Authentication with %{storageType} failed
+      link_files_in_storage: Link files in %{storageType}
+      link_existing_files: Link existing files
+      upload_files: Upload files
+      drop_files: Drop files here to upload them to %{name}.
+      drop_or_click_files: Drop files here or click to upload them to %{name}.
+      login: "%{storageType} login"
+      login_to: Login to %{storageType}
+      no_connection: No %{storageType} connection
+      open_storage: Open %{storageType}
+      select_location: Select location
+      choose_location: Choose location
+      new_folder: New folder
+      types:
+        nextcloud: Nextcloud
+        one_drive: OneDrive
+        sharepoint: SharePoint
+        default: Storage
+      information:
+        authentication_error: The request to %{storageType} could not be authenticated, that's an error.
+        connection_error: 'Some %{storageType} settings are not working. Please contact your %{storageType} administrator.
+
+          '
+        live_data_error: Error fetching file details
+        live_data_error_description: 'Some %{storageType} data could not be fetched. Please try to reload this page or contact your %{storageType} administrator.
+
+          '
+        no_file_links: In order to link files to this work package please do it via %{storageType}.
+        not_logged_in: 'To add a link, see or upload files related to this work package, please login to %{storageType}.
+
+          '
+        suggest_logout: You can try whether logging out and back in fixes this problem.
+        suggest_relink: You can try whether re-linking your account via the login button below fixes this problem.
+      files:
+        already_existing_header: This file already exists
+        already_existing_body: 'A file with the name "%{fileName}" already exists in the location where you are trying to upload this file. What would you like to do?
+
+          '
+        directory_not_writeable: You do not have permission to add files to this folder.
+        dragging_many_files: The upload to %{storageType} supports only one file at once.
+        dragging_folder: The upload to %{storageType} does not support folders.
+        empty_folder: This folder is empty.
+        empty_folder_location_hint: Click the button below to upload the file to this location.
+        file_not_selectable_location: Selecting a file is not possible in the process of choosing a location.
+        project_folder_no_access: 'You have no access to the project folder. Please, contact your administrator to get access or upload the file in another location.
+
+          '
+        managed_project_folder_not_available: 'The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
+
+          '
+        managed_project_folder_no_access: 'You have no access yet to the managed project folder. Please wait a bit and try again.
+
+          '
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already.
+        upload_keep_both: Keep both
+        upload_replace: Replace
+      file_links:
+        empty: 'Currently there are no linked files to this work package. Start linking files with the action below or from within %{storageType}.
+
+          '
+        download: Download %{fileName}
+        open: Open file on storage
+        open_location: Open file in location
+        remove: Remove file link
+        remove_confirmation: 'Are you sure you want to unlink the file from this work package? Unlinking does not affect the original file and only removes the connection to this work package.
+
+          '
+        remove_short: Remove link
+        select: Select files
+        select_all: Select all
+        selection:
+          zero: Select files to link
+          one: Link 1 file
+          other: Link %{count} files
+        success_create:
+          one: Successfully created 1 file link.
+          other: Successfully created %{count} file links.
+        upload_error:
+          default: 'Your file (%{fileName}) could not be uploaded.
+
+            '
+          403: 'Your file (%{fileName}) could not be uploaded due to system restrictions. Please contact your administrator for more information.
+
+            '
+          413: 'Your file (%{fileName}) is bigger than what OpenProject can upload to %{storageType}. You can upload it directly to %{storageType} first and then link the file.
+
+            '
+          507: 'Your file (%{fileName}) is bigger than the storage quota allows. Contact your administrator to modify this quota.
+
+            '
+          detail:
+            nextcloud: 'Please check that the latest version of the Nextcloud App "OpenProject Integration" is installed and contact your administrator for more information.
+
+              '
+        link_uploaded_file_error: 'An error occurred linking the recently uploaded file ''%{fileName}'' to the work package %{workPackageId}.
+
+          '
+        tooltip:
+          not_logged_in: Please log in to the storage to access this file.
+          view_not_allowed: You have no permission to see this file.
+          not_found: This file cannot be found.
+        already_linked_file: This file is already linked to this work package.
+        already_linked_directory: This directory is already linked to this work package.
diff --git a/modules/storages/config/locales/crowdin/ru.yml b/modules/storages/config/locales/crowdin/ru.yml
index 0127ce9e949..c819ab14b46 100644
--- a/modules/storages/config/locales/crowdin/ru.yml
+++ b/modules/storages/config/locales/crowdin/ru.yml
@@ -212,20 +212,20 @@ ru:
         validation_result_component:
           checks:
             failures:
-              one: "%{count} check failed"
-              few: "%{count} checks failed"
-              many: "%{count} checks failed"
-              other: "%{count} checks failed"
-            success: All checks passed
+              one: "%{count} проверка не удалась"
+              few: "%{count} проверок не удалось"
+              many: "%{count} проверок не удалось"
+              other: "%{count} проверок не удалось"
+            success: Все проверки пройдены
             warnings:
-              one: "%{count} check returned a warning"
-              few: "%{count} checks returned a warning"
-              many: "%{count} checks returned a warning"
-              other: "%{count} checks returned a warning"
+              one: "%{count} проверка вернула предупреждение"
+              few: "%{count} проверок вернули предупреждение"
+              many: "%{count} проверок вернули предупреждение"
+              other: "%{count} проверок вернули предупреждение"
           summary:
-            failure: Some checks failed and the system does not work as expected.
-            success: All connections and systems are working as expected.
-            warning: Some checks returned a warning. This can lead to unexpected behaviour.
+            failure: Некоторые проверки не удались, и система работает не так, как ожидалось.
+            success: Все соединения и системы работают как положено.
+            warning: Некоторые проверки вернули предупреждение. Это может привести к неожиданному поведению.
     buttons:
       done_continue: Готово, продолжить
       open_storage: Открыть хранилище файлов
@@ -332,49 +332,49 @@ ru:
           storage_configured: Настройка завершена
           tenant_id: Идентификатор арендатора
         errors:
-          client_id_invalid: The configured OAuth 2 client id is invalid. Please check the configuration.
-          client_secret_invalid: The configured OAuth 2 client secret is invalid. Please check the configuration.
-          nc_dependency_missing: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.'
-          nc_dependency_version_mismatch: The %{dependency} app version is not supported. Please update your Nextcloud server.
-          nc_host_not_found: No Nextcloud server found at the configured host url. Please check the configuration.
-          nc_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
-          nc_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
-          nc_oauth_token_missing: OpenProject cannot test the user level communication with Nextcloud as the user did not yet link their Nextcloud account.
-          nc_project_folder_missing: The previously created project folder for project "%{project}" could not be found.
-          nc_team_folder_not_found: The team folder could not be found.
-          nc_unexpected_files: 'Unexpected files found in the managed team folder. For example: %{sample}'
-          nc_unlinked_project_folders: Not all project folders have been created yet (%{actual} / %{expected}). This can indicate errors during the AMPF background synchronization.
-          nc_userless_access_denied: The configured app password is invalid.
-          not_configured: The connection could not be validated. Please finish configuration first.
-          od_client_cant_delete_folder: The client is having trouble deleting folders. Please check the setup documentation for your storage.
-          od_client_write_permission_missing: The client seems to have write permissions missing. Please check the setup documentation for your storage.
-          od_drive_id_invalid: The configured drive id seems invalid. Please check the configuration.
-          od_drive_id_not_found: The configured drive id could not be found. Please check the configuration.
-          od_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
-          od_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
-          od_oauth_token_missing: OpenProject cannot test the user level communication with OneDrive as the user did not yet link their Microsoft account.
-          od_tenant_id_wrong: The configured directory (tenant) id is invalid. Please check the configuration.
-          od_test_folder_exists: The folder %{folder_name} needed for testing already exists. Please delete it and try again.
-          od_unexpected_content: Unexpected content found in the drive.
-          offline_access_scope_missing: It is recommended to configure the OpenID Connect provider to request the offline_access scope. The integration may still work anyways, but make sure that refresh tokens do not expire.
-          oidc_cant_refresh_token: There was an error while trying to check your access to the storage. Please check the server logs for further information.
-          oidc_non_oidc_user: The current user, while provisioned, wasn't provisioned by an OpenID Connect (OIDC) Identity Provider. Please re-run the check with an OIDC provisioned user.
-          oidc_non_provisioned_user: The current user isn't provided by an OpenID Connect Identity Provider. Please re-run the check with a provided user.
-          oidc_provider_cant_exchange: The OpenID Connect provider does not seem to support token exchange, but token exchange was configured for the storage.
-          oidc_token_acquisition_failed: Your OpenID Connect setup doesn't provide the necessary audience, nor does it provide token exchange capabilities. Please check out our documentation for more information.
-          oidc_token_exchange_failed: There seems to be a problem with the Token Exchange setup on your OpenID Connect Provider. Please check its configuration and try again.
-          oidc_token_refresh_failed: There was an error while trying to check your access to the storage. Please check the server logs for further information.
-          sp_client_cant_delete_folder: The client is having trouble deleting folders in SharePoint. Please check the setup documentation for your storage.
-          sp_client_id_missing: The configured OAuth 2 client id is missing for SharePoint. Please check the configuration.
-          sp_client_secret_missing: The configured OAuth 2 client secret is missing for SharePoint. Please check the configuration.
-          sp_client_write_permission_missing: The client seems to have write permissions missing in SharePoint. Please check the setup documentation for your storage.
-          sp_existing_test_folder: The folder %{folder_name} needed for testing already exists in SharePoint. Please delete it and try again.
-          sp_oauth_request_error: The user-bound request to SharePoint failed. Please check the server logs for further information.
-          sp_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information.
-          sp_oauth_token_missing: OpenProject cannot test the user level communication with SharePoint as the user did not yet link their SharePoint account.
-          sp_tenant_id_missing: The configured directory (tenant) id is missing for SharePoint. Please check the configuration.
-          sp_unexpected_content: Unexpected content found in the SharePoint Document Library.
-          unknown_error: The connection could not be validated. An unknown error occurred. Please check the server logs for further information.
+          client_id_invalid: Настроенный идентификатор клиента OAuth 2 недействителен. Пожалуйста, проверьте конфигурацию.
+          client_secret_invalid: Настроенный ключ клиента OAuth 2 недействителен. Пожалуйста, проверьте конфигурацию.
+          nc_dependency_missing: 'Необходимая зависимость отсутствует в хранилище. Пожалуйста, добавьте следующую зависимость: %{dependency}.'
+          nc_dependency_version_mismatch: Версия приложения %{dependency} не поддерживается. Пожалуйста, обновите ваш NextCloud сервер.
+          nc_host_not_found: По настроенному адресу хоста сервер Nextcloud не найден. Пожалуйста, проверьте конфигурацию.
+          nc_oauth_request_not_found: Конечная точка для получения данных о текущем подключенном пользователе не найдена. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          nc_oauth_request_unauthorized: Текущий пользователь не авторизован для доступа к удаленному файловому хранилищу. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          nc_oauth_token_missing: OpenProject не может протестировать связь пользователя с Nextcloud, так как пользователь еще не связал свою учетную запись Nextcloud.
+          nc_project_folder_missing: Ранее созданная папка проекта "%{project}" не найдена.
+          nc_team_folder_not_found: Папка команды не найдена.
+          nc_unexpected_files: 'Неожиданные файлы найдены в папке команды. Например: %{sample}'
+          nc_unlinked_project_folders: Еще не все папки проекта были созданы (%{actual} / %{expected}). Это может указывать на ошибки во время фоновой синхронизации AMPF.
+          nc_userless_access_denied: Указанный пароль приложения неверен.
+          not_configured: Соединение не удалось подтвердить. Пожалуйста, сначала завершите настройку.
+          od_client_cant_delete_folder: У клиента возникли проблемы с удалением папок. Пожалуйста, проверьте документацию для вашего хранилища.
+          od_client_write_permission_missing: Клиент не имеет прав на запись. Пожалуйста, проверьте настройки вашего хранилища.
+          od_drive_id_invalid: Указанный идентификатор диска кажется недопустимым. Пожалуйста, проверьте конфигурацию.
+          od_drive_id_not_found: Указанный идентификатор диска не найден. Пожалуйста, проверьте конфигурацию.
+          od_oauth_request_not_found: Конечная точка для получения данных о текущем подключенном пользователе не найдена. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          od_oauth_request_unauthorized: Текущий пользователь не авторизован для доступа к удаленному файловому хранилищу. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          od_oauth_token_missing: OpenProject не может протестировать связь пользователя с OneDrive, так как пользователь еще не связал свою учетную запись Майкрософт.
+          od_tenant_id_wrong: Указанный идентификатор каталога недействителен. Пожалуйста, проверьте конфигурацию.
+          od_test_folder_exists: Папка %{folder_name}, необходимая для тестирования уже существует. Удалите ее и повторите попытку.
+          od_unexpected_content: На диске обнаружено неожиданное содержимое.
+          offline_access_scope_missing: Рекомендуется настроить провайдера OpenID Connect для запроса области offline_access. Интеграция может работать в любом случае, но убедитесь, что токены обновления не истекают.
+          oidc_cant_refresh_token: Произошла ошибка во время проверки Вашего доступа к хранилищу. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          oidc_non_oidc_user: Текущий пользователь не представлен провайдером идентификации OpenID Connect (OIDC). Пожалуйста, повторите проверку пользователя, идентифицированного через OIDC.
+          oidc_non_provisioned_user: Текущий пользователь не представлен провайдером идентификации OpenID Connect. Пожалуйста, повторите проверку пользователя.
+          oidc_provider_cant_exchange: Провайдер OpenID Connect, похоже, не поддерживает обмен токенами, но обмен токенами был настроен для хранилища.
+          oidc_token_acquisition_failed: Ваша настройка OpenID Connect не обеспечивает необходимую аудиторию и не предоставляет возможности обмена токенами. Пожалуйста, ознакомьтесь с нашей документацией для получения дополнительной информации.
+          oidc_token_exchange_failed: Похоже, возникла проблема с настройкой Token Exchange вашего провайдера OpenID Connect. Пожалуйста, проверьте его конфигурацию и повторите попытку.
+          oidc_token_refresh_failed: Произошла ошибка во время проверки Вашего доступа к хранилищу. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          sp_client_cant_delete_folder: У клиента возникли проблемы с удалением папок в SharePoint. Пожалуйста, проверьте документацию по настройке Вашего хранилища.
+          sp_client_id_missing: Настроенный идентификатор клиента OAuth 2 отсутствует для SharePoint. Пожалуйста, проверьте конфигурацию.
+          sp_client_secret_missing: Настроенный ключ клиента OAuth 2 отсутствует для SharePoint. Пожалуйста, проверьте конфигурацию.
+          sp_client_write_permission_missing: Похоже, что у клиента отсутствуют разрешения на запись в SharePoint. Пожалуйста, проверьте документацию по настройке Вашего хранилища.
+          sp_existing_test_folder: Папка %{folder_name}, необходимая для тестирования, уже существует в SharePoint. Пожалуйста, удалите ее и попробуйте снова.
+          sp_oauth_request_error: Запрос к SharePoint, связанный с пользователем, завершился неудачей. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          sp_oauth_request_unauthorized: Текущий пользователь не авторизован для доступа к удаленному файловому хранилищу. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
+          sp_oauth_token_missing: OpenProject не может протестировать взаимодействие пользователя с SharePoint, поскольку пользователь еще не связал свою учетную запись с SharePoint.
+          sp_tenant_id_missing: Указанный идентификатор каталога отсутствует для SharePoint. Пожалуйста, проверьте конфигурацию.
+          sp_unexpected_content: Неожиданное содержимое обнаружено в библиотеке документов SharePoint.
+          unknown_error: Соединение не удалось подтвердить. Произошла неизвестная ошибка. Пожалуйста, проверьте журналы сервера для получения дополнительной информации.
       label_error: Ошибка
       label_healthy: Здоровые
       label_pending: В ожидании
diff --git a/modules/storages/spec/requests/storages/project_settings/oauth_access_grant_flow_spec.rb b/modules/storages/spec/requests/storages/project_settings/oauth_access_grant_flow_spec.rb
index 59f714c67e4..feb14d7fb8a 100644
--- a/modules/storages/spec/requests/storages/project_settings/oauth_access_grant_flow_spec.rb
+++ b/modules/storages/spec/requests/storages/project_settings/oauth_access_grant_flow_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe "GET /projects/:project_id/settings/project_storages/:id/oauth_ac
         project_id: project_storage.project.id,
         id: project_storage
       )
-      expect(last_response).to have_http_status(:unauthorized)
+      expect(last_response).to have_http_status(:found)
     end
   end
 
diff --git a/modules/storages/spec/spec_helper.rb b/modules/storages/spec/spec_helper.rb
index 75fd8167ed7..192342bf38b 100644
--- a/modules/storages/spec/spec_helper.rb
+++ b/modules/storages/spec/spec_helper.rb
@@ -34,7 +34,7 @@
 # Loads spec_helper from OpenProject core
 # This will include any support file from OpenProject core
 require "spec_helper"
-require "dry/container/stub"
+require "dry/core/container/stub"
 
 STORAGES_CASSETTE_LIBRARY_DIR = "modules/storages/spec/support/fixtures/vcr_cassettes"
 
diff --git a/modules/team_planner/config/locales/crowdin/hy.yml b/modules/team_planner/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..5daeb59d458
--- /dev/null
+++ b/modules/team_planner/config/locales/crowdin/hy.yml
@@ -0,0 +1,22 @@
+#English strings go here
+---
+hy:
+  plugin_openproject_team_planner:
+    name: OpenProject Team Planner
+    description: Provides team planner views.
+  permission_view_team_planner: View team planner
+  permission_manage_team_planner: Manage team planner
+  project_module_team_planner_view: Team planners
+  ee:
+    feature_names:
+      team_planner_view: Team planner
+    upsell:
+      team_planner_view:
+        title: Team planner
+        description: Get a complete overview of your team’s planning with Team Planner. Stretch, shorten and drag-and-drop work packages to modify dates, move them or change assignees.
+  team_planner:
+    label_team_planner: Team planner
+    label_new_team_planner: New team planner
+    label_create_new_team_planner: Create new team planner
+    label_team_planner_plural: Team planners
+    label_assignees: Assignees
diff --git a/modules/team_planner/config/locales/crowdin/js-hy.yml b/modules/team_planner/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..2da9f02b2da
--- /dev/null
+++ b/modules/team_planner/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,30 @@
+#English strings go here
+---
+hy:
+  js:
+    team_planner:
+      add_existing: Add existing
+      label_team_planner_plural: Team planners
+      add_existing_title: Add existing work packages
+      create_label: Team planner
+      create_title: Create new team planner
+      unsaved_title: Unnamed team planner
+      no_data: Add assignees to set up your team planner.
+      add_assignee: Assignee
+      remove_assignee: Remove assignee
+      two_weeks: 2-week
+      one_week: 1-week
+      four_weeks: 4-week
+      eight_weeks: 8-week
+      work_week: Work week
+      today: Today
+      drag_here_to_remove: Drag here to remove assignee and start and end dates.
+      cannot_drag_here: Cannot move the work package due to permissions or editing restrictions.
+      cannot_drag_to_non_working_day: This work package cannot start/finish on a non-working day.
+      quick_add:
+        empty_state: Use the search field to find work packages and drag them to the planner to assign it to someone and define start and end dates.
+        search_placeholder: Search...
+      modify:
+        errors:
+          permission_denied: You do not have the necessary permissions to modify this.
+          fallback: This work package cannot be edited.
diff --git a/modules/two_factor_authentication/config/locales/crowdin/hy.yml b/modules/two_factor_authentication/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..7527951d761
--- /dev/null
+++ b/modules/two_factor_authentication/config/locales/crowdin/hy.yml
@@ -0,0 +1,181 @@
+#English strings go here for Rails i18n
+---
+hy:
+  plugin_openproject_two_factor_authentication:
+    name: OpenProject Two-factor authentication
+    description: This OpenProject plugin authenticates your users using two-factor authentication by means of one-time password through the TOTP standard (Google Authenticator) or sent to the user's cell phone via SMS or voice call.
+  activerecord:
+    attributes:
+      two_factor_authentication/device:
+        identifier: Identifier
+        default: Use as default
+        channel: Channel
+      two_factor_authentication/device/sms:
+        phone_number: Phone number
+      two_factor_authentication/device/webauthn:
+        webauthn_external: WebAuthn ID
+        webauthn_public_key: WebAuthn public key
+    errors:
+      models:
+        two_factor_authentication/device:
+          default_already_exists: is already set for another OTP device.
+        two_factor_authentication/device/sms:
+          attributes:
+            phone_number:
+              error_phone_number_format: must be of format +XX XXXXXXXXX
+    models:
+      two_factor_authentication/device: 2FA device
+      two_factor_authentication/device/sms: Mobile phone
+      two_factor_authentication/device/totp: Authenticator application
+      two_factor_authentication/device/webauthn: WebAuthn
+  two_factor_authentication:
+    error_2fa_disabled: 2FA delivery has been disabled.
+    notice_not_writable: 2FA Settings were provided through environment variables and cannot be overwritten.
+    error_no_device: No registered 2FA device found for this user, despite being required for this instance.
+    error_no_matching_strategy: No matching 2FA strategy available for this user. Please contact your administratior.
+    error_is_enforced_not_active: 'Configuration error: Two-factor authentication has been enforced, but no active strategies exist.'
+    error_invalid_backup_code: Invalid 2FA backup code
+    channel_unavailable: The delivery channel %{channel} is unavailable.
+    no_valid_phone_number: No valid phone number exists.
+    label_device_type: Device type
+    label_default_device: Default 2FA device
+    label_device: 2FA device
+    label_devices: 2FA devices
+    label_2fa_enabled: Two-factor authentication is active
+    label_2fa_disabled: Two-factor authentication not active
+    text_otp_delivery_message_sms: Your %{app_title} one-time password is %{token}
+    text_otp_delivery_message_voice: 'Your %{app_title} one-time password is: %{pause} %{token}. %{pause} I repeat: %{pause} %{token}'
+    text_2fa_enabled: Upon every login, you will be requested to enter a OTP token from your default 2FA device.
+    text_2fa_disabled: To enable two-factor authentication, use the button above to register a new 2FA device. If you already have a device, you need to make it a default.
+    login:
+      enter_backup_code_title: Enter backup code
+      enter_backup_code_text: Please enter a valid backup code from your list of codes in case you can no longer access your registered 2FA devices.
+      other_device: Use another device or backup code
+    settings:
+      title: 2FA settings
+      current_configuration: Current configuration
+      label_active_strategies: Active 2FA strategies
+      label_enforced: Enforce 2FA
+      label_remember: Remember 2FA login
+      text_configuration: 'Note: These values represent the current application-wide configuration. You cannot disable settings enforced by the configuration or change the current active strategies, since they require a server restart.
+
+        '
+      text_configuration_guide: For more information, check the configuration guide.
+      text_enforced: Enable this setting to force all users to register a 2FA device on their next login. Can only be disabled when not enforced by configuration.
+      text_remember: |
+        Set this to greater than zero to allow users to remember their 2FA authentication for the given number of days.
+        They will not be requested to re-enter it during that period. Can only be set when not enforced by configuration.
+      failed_to_save_settings: 'Failed to update 2FA settings: %{message}'
+    admin:
+      self_edit_path_html: To add or modify your own 2FA devices, please go to the [Two-factor authentication on your account page](self_edit_link)
+      self_edit_forbidden: You may not edit your own 2FA devices on this path. Go to My Account > Two factor authentication instead.
+      no_devices_for_user: No 2FA device has been registered for this user.
+      all_devices_deleted: All 2FA devices of this user have been deleted
+      delete_all_are_you_sure: Are you sure you want to delete all 2FA devices for this user?
+      button_delete_all_devices: Delete registered 2FA devices
+      button_register_mobile_phone_for_user: Register mobile phone
+      text_2fa_enabled: Upon every login, this user will be requested to enter a OTP token from their default 2FA device.
+      text_2fa_disabled: The user did not set up a 2FA device through their 'My account page'
+      only_sms_allowed: Only SMS delivery can be set up for other users.
+    backup_codes:
+      singular: Backup code
+      plural: Backup codes
+      overview_description: |
+        If you are unable to access your two factor devices, you can use a backup code to regain access to your account.
+        Use the following button to generate a new set of backup codes.
+      generate:
+        title: Generate backup codes
+        keep_safe_as_password: Important! Treat these codes as passwords.
+        keep_safe_warning: Either save them in your password manager, or print this page and put in a safe place.
+        regenerate_warning: 'Warning: If you have created backup codes before, they will be invalidated and will no longer work.'
+    devices:
+      add_new: Add new 2FA device
+      register: Register device
+      confirm_default: Confirm changing default device
+      confirm_device: Confirm device
+      confirm_now: Not confirmed, click here to activate
+      cannot_delete_default: Cannot delete default device
+      make_default_are_you_sure: Are you sure you want to make this 2FA device your default?
+      make_default_failed: Failed to update the default 2FA device.
+      deletion_are_you_sure: Are you sure you want to delete this 2FA device?
+      registration_complete: 2FA device registration complete!
+      registration_failed_token_invalid: 2FA device registration failed, the token was invalid.
+      registration_failed_update: 2FA device registration failed, the token was valid but the device could not be updated.
+      confirm_send_failed: Confirmation of your 2FA device failed.
+      button_complete_registration: Complete 2FA registration
+      text_confirm_to_complete_html: Please complete the registration of your device <strong>%{identifier}</strong> by entering a one-time password from your default device.
+      text_confirm_to_change_default_html: Please confirm changing your default device to <strong>%{new_identifier}</strong> by entering a one-time password from your current default device.
+      text_identifier: You can give the device a custom identifier using this field.
+      failed_to_delete: Failed to delete 2FA device.
+      is_default_cannot_delete: The device is marked as default and cannot be deleted due to an active security policy. Mark another device as default before deleting.
+      not_existing: No 2FA device has been registered for your account.
+      2fa_from_input_html: Please enter the code from your <strong>%{device_name}</strong> to verify your identity.
+      2fa_from_webauthn_html: Please provide the WebAuthn device <strong>%{device_name}</strong>. If it is USB based make sure to plug it in and touch it. Then click the sign in button.
+      webauthn:
+        title: WebAuthn
+        description: Register a FIDO2 device (like YubiKey) or the secure enclave of your mobile device.
+        further_steps: After you have chosen a name, you can click the Continue button. Your browser will prompt you to present your WebAuthn device. When you have done so, you are done registering the device.
+      totp:
+        title: App-based authenticator
+        provisioning_uri: Provisioning URI
+        secret_key: Secret key
+        time_based: Time based
+        account: Account name / Issuer
+        setup: |
+          For setting up two-factor authentication with Google Authenticator, download the application from the Apple App store or Google Play Store.
+          After opening the app, you can scan the following QR code to register the device.
+        question_cannot_scan: 'Unable to scan the code using your application?
+
+          '
+        text_cannot_scan: 'If you can''t scan the code, you can enter the entry manually using the following details:
+
+          '
+        description: 'Use a one-time code generated by an authenticator like Authy or Google Authenticator.
+
+          '
+      sms:
+        title: Mobile device
+        redacted_identifier: Mobile device (%{redacted_number})
+        request_2fa_identifier: "%{redacted_identifier}, we sent you an authentication code via %{delivery_channel}"
+        description: 'Receive 2FA code via a text message on your phone each time you log in.
+
+          '
+    sns:
+      delivery_failed: 'SNS delivery failed:'
+    message_bird:
+      sms_delivery_failed: MessageBird SMS delivery failed.
+      voice_delivery_failed: MessageBird voice call failed.
+    strategies:
+      totp: Authenticator application
+      sns: Amazon SNS
+      resdt: SMS Rest API
+      webauthn: WebAuthn
+    mobile_transmit_notification: A one-time password has been sent to your cell phone.
+    label_two_factor_authentication: Two-factor authentication
+    forced_registration:
+      required_to_add_device: An active security policy requires you to enable two-factor authentication. Please use the following form to register a device.
+    remember:
+      active_session_notice: 'Your account has an active remember cookie valid until %{expires_on}. This cookie allows you to log in without a second factor to your account until that time.
+
+        '
+      other_active_session_notice: Your account has an active remember cookie on another session.
+      label: Remember
+      clear_cookie: Click here to remove all remembered 2FA sessions.
+      cookie_removed: All remembered 2FA sessions have been removed.
+      dont_ask_again: Create cookie to remember 2FA authentication on this client for %{days} days.
+  field_otp: One-time password
+  notice_account_otp_invalid: Invalid one-time password.
+  notice_account_otp_expired: The one-time password you entered expired.
+  notice_developer_strategy_otp: 'Developer strategy generated the following one-time password: %{token} (Channel: %{channel})'
+  notice_account_otp_send_failed: Your one-time password could not be sent.
+  notice_account_has_no_phone: No cell phone number is associated with your account.
+  label_confirmed: Confirmed
+  button_continue: Continue
+  button_make_default: Mark as default
+  notice_phone_number_format: 'Please enter the number in the following format: +XX XXXXXXXX.'
+  text_otp_not_receive: Other verification methods
+  text_send_otp_again: 'Resend one-time password by:'
+  button_resend_otp_form: Resend
+  button_otp_by_voice: Voice call
+  button_otp_by_sms: SMS
+  label_otp_channel: Delivery channel
diff --git a/modules/two_factor_authentication/config/locales/crowdin/js-hy.yml b/modules/two_factor_authentication/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..75bd142dbc1
--- /dev/null
+++ b/modules/two_factor_authentication/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,27 @@
+#-- copyright
+#OpenProject is an open source project management software.
+#Copyright (C) the OpenProject GmbH
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License version 3.
+#OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#Copyright (C) 2006-2013 Jean-Philippe Lang
+#Copyright (C) 2010-2013 the ChiliProject Team
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    two_factor_authentication:
+      errors:
+        aborted: The authentication was cancelled. Please try again.
diff --git a/modules/webhooks/config/locales/crowdin/hy.yml b/modules/webhooks/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..16a34da4823
--- /dev/null
+++ b/modules/webhooks/config/locales/crowdin/hy.yml
@@ -0,0 +1,75 @@
+---
+hy:
+  plugin_openproject_webhooks:
+    name: OpenProject Webhooks
+    description: Provides a plug-in API to support OpenProject webhooks for better 3rd party integration.
+  activerecord:
+    attributes:
+      webhooks/webhook:
+        url: Payload URL
+        secret: Signature secret
+        events: Events
+        enabled: Enabled
+        projects: Enabled projects
+      webhooks/log:
+        event_name: Event name
+        url: Payload URL
+        response_code: Response code
+        response_body: Response
+    models:
+      webhooks/outgoing_webhook: Outgoing webhook
+  webhooks:
+    singular: Webhook
+    plural: Webhooks
+    resources:
+      time_entry:
+        name: Time entry
+    outgoing:
+      no_results_table: No webhooks have been defined yet.
+      label_add_new: Add new webhook
+      label_edit: Edit webhook
+      label_x_events:
+        one: 1 event
+        other: "%{count} events"
+        zero: No events
+      events:
+        created: Created
+        updated: Updated
+        comment: Comment
+        internal_comment: Internal comment
+      explanation_html: 'Upon the occurrence of an event like the creation of a work package or an update on a project, OpenProject will send a POST request to the configured web endpoints. Oftentimes, the event is sent after the [configured aggregation period](aggregation_path) has passed.
+
+        '
+      status:
+        enabled: Webhook is enabled
+        disabled: Webhook is disabled
+        enabled_text: The webhook will emit payloads for the defined events below.
+        disabled_text: Click the edit button to activate the webhook.
+      deliveries:
+        no_results_table: No deliveries have been made for this webhook in the past days.
+        title: Recent deliveries
+        time: Delivery time
+      form:
+        introduction: 'Send a POST request to the payload URL below for any event in the project you''re subscribed to. Payload will correspond to the APIv3 representation of the object being modified.
+
+          '
+        apiv3_doc_url: For more information, visit the API documentation
+        description:
+          placeholder: Optional description for the webhook.
+        enabled:
+          description: 'When checked, the webhook will trigger on the selected events. Uncheck to disable the webhook.
+
+            '
+        events:
+          title: Enabled events
+        project_ids:
+          title: Enabled projects
+          description: Select for which projects this webhook should be executed for.
+          all: All projects
+          selected: Selected projects only
+        selected_project_ids:
+          title: Selected projects
+        secret:
+          description: 'If set, this secret value is used by OpenProject to sign the webhook payload.
+
+            '
diff --git a/modules/wikis/app/components/wikis/admin/forms/general_info_form_component.html.erb b/modules/wikis/app/components/wikis/admin/forms/general_info_form_component.html.erb
index 9a5bff97a21..7f74304d01a 100644
--- a/modules/wikis/app/components/wikis/admin/forms/general_info_form_component.html.erb
+++ b/modules/wikis/app/components/wikis/admin/forms/general_info_form_component.html.erb
@@ -1,35 +1,30 @@
 <%=
   component_wrapper do
-    primer_form_with(
-      model: wiki_provider,
-      url: form_url,
-      method: form_method
-    ) do |form|
-      flex_layout do |general_info_row|
-        general_info_row.with_row(mb: 3) do
-          render(Primer::Beta::Text.new(font_weight: :bold)) { t("wikis.admin.wiki_providers.xwiki_instance") }
-        end
+    flex_layout(mb: 3) do |general_info_row|
+      general_info_row.with_row do
+        render(Primer::Beta::Text.new(font_weight: :bold)) { t("wikis.admin.wiki_providers.xwiki_instance") }
+      end
 
-        general_info_row.with_row(mb: 3) do
-          render(Primer::Beta::Text.new(test_selector: "wiki-provider-configuration-instructions")) do
-            t(".xwiki_instance_description")
-          end
+      general_info_row.with_row do
+        render(Primer::Beta::Text.new(color: :subtle, test_selector: "wiki-provider-configuration-instructions")) do
+          t(".xwiki_instance_description")
         end
+      end
 
-        general_info_row.with_row(mb: 3) do
-          render(Wikis::Admin::NameInputForm.new(form))
-        end
-
-        general_info_row.with_row(mb: 3) do
-          render(Wikis::Admin::UrlInputForm.new(form))
-        end
-
-        general_info_row.with_row(mb: 3) do
-          render(Wikis::Admin::XWikiAuthenticationMethodSelectForm.new(form))
-        end
-
-        general_info_row.with_row do
-          render(Wikis::Admin::SubmitOrCancelForm.new(form, wiki_provider:))
+      general_info_row.with_row(mt: 3) do
+        primer_form_with(
+          model: wiki_provider,
+          url: form_url,
+          method: form_method
+        ) do |form|
+          render(
+            Primer::Forms::FormList.new(
+              Wikis::Admin::NameInputForm.new(form),
+              Wikis::Admin::UrlInputForm.new(form),
+              Wikis::Admin::XWikiAuthenticationMethodSelectForm.new(form),
+              Wikis::Admin::SubmitOrCancelForm.new(form, wiki_provider:)
+            )
+          )
         end
       end
     end
diff --git a/modules/wikis/app/components/wikis/admin/forms/oauth_application_form_component.html.erb b/modules/wikis/app/components/wikis/admin/forms/oauth_application_form_component.html.erb
index 7c0e6515310..be3f3e4d80d 100644
--- a/modules/wikis/app/components/wikis/admin/forms/oauth_application_form_component.html.erb
+++ b/modules/wikis/app/components/wikis/admin/forms/oauth_application_form_component.html.erb
@@ -1,12 +1,12 @@
 <%=
   component_wrapper do
     flex_layout(flex_items: :center) do |credentials_row|
-      credentials_row.with_row(mb: 3) do
+      credentials_row.with_row do
         render(Primer::Beta::Text.new(font_weight: :bold)) { t("wikis.admin.wiki_providers.oauth.openproject_oauth") }
       end
 
       credentials_row.with_row(mb: 3) do
-        render(Primer::Beta::Text.new) { t("wikis.admin.wiki_providers.#{wiki_provider}.oauth.openproject_oauth_description") }
+        render(Primer::Beta::Text.new(color: :subtle)) { t("wikis.admin.wiki_providers.#{wiki_provider}.oauth.openproject_oauth_description") }
       end
 
       credentials_row.with_row(mb: 3) do
@@ -42,11 +42,13 @@
       end
 
       credentials_row.with_row do
-        render(Primer::Beta::Button.new(
-          scheme: :primary,
-          tag: :a,
-          href: done_button_path
-        )) { t("wikis.buttons.done_continue") }
+        render(
+          Primer::Beta::Button.new(
+            scheme: :primary,
+            tag: :a,
+            href: done_button_path
+          )
+        ) { t("wikis.buttons.done_continue") }
       end
     end
   end
diff --git a/modules/wikis/app/components/wikis/admin/forms/oauth_client_form_component.html.erb b/modules/wikis/app/components/wikis/admin/forms/oauth_client_form_component.html.erb
index 3ced3ef25d0..1c71a51c859 100644
--- a/modules/wikis/app/components/wikis/admin/forms/oauth_client_form_component.html.erb
+++ b/modules/wikis/app/components/wikis/admin/forms/oauth_client_form_component.html.erb
@@ -6,12 +6,12 @@
       method: form_method
     ) do |form|
       flex_layout do |oauth_client_row|
-        oauth_client_row.with_row(mb: 3) do
+        oauth_client_row.with_row do
           render(Primer::Beta::Text.new(font_weight: :bold)) { t("wikis.admin.wiki_providers.#{wiki_provider}.oauth.provider_oauth") }
         end
 
         oauth_client_row.with_row(mb: 3) do
-          render(Primer::Beta::Text.new) { t("wikis.admin.wiki_providers.#{wiki_provider}.oauth.provider_oauth_description") }
+          render(Primer::Beta::Text.new(color: :subtle)) { t("wikis.admin.wiki_providers.#{wiki_provider}.oauth.provider_oauth_description") }
         end
 
         oauth_client_row.with_row(mb: 3) do
@@ -31,8 +31,12 @@
         end
 
         oauth_client_row.with_row do
-          concat(render(Wikis::Admin::SubmitOrCancelForm.new(form, wiki_provider:,
-                                                             cancel_button_options: { href: cancel_button_path })))
+          render(
+            Wikis::Admin::SubmitOrCancelForm.new(
+              form, wiki_provider:,
+                    cancel_button_options: { href: cancel_button_path }
+            )
+          )
         end
       end
     end
diff --git a/modules/wikis/app/forms/wikis/admin/xwiki_authentication_method_select_form.rb b/modules/wikis/app/forms/wikis/admin/xwiki_authentication_method_select_form.rb
index fbd4d21b9f3..e7dda272cd4 100644
--- a/modules/wikis/app/forms/wikis/admin/xwiki_authentication_method_select_form.rb
+++ b/modules/wikis/app/forms/wikis/admin/xwiki_authentication_method_select_form.rb
@@ -34,7 +34,8 @@ module Wikis::Admin
       f.select_list(
         name: :authentication_method,
         label: I18n.t("activerecord.attributes.wikis/xwiki_provider.authentication_method"),
-        required: true
+        required: true,
+        input_width: :large
       ) do |select|
         Wikis::XWikiProvider::AUTHENTICATION_METHODS.each do |method|
           select.option(
diff --git a/modules/wikis/app/services/wikis/adapters/providers/internal/registry.rb b/modules/wikis/app/services/wikis/adapters/providers/internal/registry.rb
index e6c5411b23d..9e747ca7994 100644
--- a/modules/wikis/app/services/wikis/adapters/providers/internal/registry.rb
+++ b/modules/wikis/app/services/wikis/adapters/providers/internal/registry.rb
@@ -32,7 +32,7 @@ module Wikis
   module Adapters
     module Providers
       module Internal
-        Registry = Dry::Container::Namespace.new("internal") do
+        Registry = Dry::Core::Container::Namespace.new("internal") do
           namespace("authentication") do
             register(:user_bound, Authentication::UserBound)
           end
diff --git a/modules/wikis/app/services/wikis/adapters/providers/xwiki/registry.rb b/modules/wikis/app/services/wikis/adapters/providers/xwiki/registry.rb
index 84572258088..68652d6c135 100644
--- a/modules/wikis/app/services/wikis/adapters/providers/xwiki/registry.rb
+++ b/modules/wikis/app/services/wikis/adapters/providers/xwiki/registry.rb
@@ -32,7 +32,7 @@ module Wikis
   module Adapters
     module Providers
       module XWiki
-        Registry = Dry::Container::Namespace.new("xwiki") do
+        Registry = Dry::Core::Container::Namespace.new("xwiki") do
           namespace("authentication") do
             register(:user_bound, Authentication::UserBound)
           end
diff --git a/modules/wikis/app/services/wikis/adapters/registry.rb b/modules/wikis/app/services/wikis/adapters/registry.rb
index df57ef01321..1ae622ae8a6 100644
--- a/modules/wikis/app/services/wikis/adapters/registry.rb
+++ b/modules/wikis/app/services/wikis/adapters/registry.rb
@@ -28,12 +28,12 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "dry/container"
+require "dry/core/container"
 
 module Wikis
   module Adapters
     class Registry
-      extend Dry::Container::Mixin
+      extend Dry::Core::Container::Mixin
 
       class Error < StandardError
       end
@@ -51,13 +51,13 @@ module Wikis
         keys.map { it.split(".").first }.uniq
       end
 
-      class Resolver < Dry::Container::Resolver
+      class Resolver < Dry::Core::Container::Resolver
         def call(container, key)
           Rails.logger.tagged("Wikis::Adapters::Registry") do
             Rails.logger.info "Resolving #{key}"
             super
           end
-        rescue Dry::Container::KeyError => e
+        rescue Dry::Core::Container::KeyError => e
           error = registry_error_for(key)
 
           Rails.logger.tagged("Wikis::Adapters::Registry") { Rails.logger.error (error || e).message }
diff --git a/modules/wikis/app/services/wikis/concerns/update_reverse_inline_wiki_page_links.rb b/modules/wikis/app/services/wikis/concerns/update_reverse_inline_wiki_page_links.rb
index be443b9b67c..44828c1be66 100644
--- a/modules/wikis/app/services/wikis/concerns/update_reverse_inline_wiki_page_links.rb
+++ b/modules/wikis/app/services/wikis/concerns/update_reverse_inline_wiki_page_links.rb
@@ -32,16 +32,31 @@ module Wikis::Concerns
   module UpdateReverseInlineWikiPageLinks
     extend ActiveSupport::Concern
 
+    # Mirrors the prefix character class of the inline-text macro matcher.
+    # The trailing `(?!\w)` on the semantic branch keeps `#PROJ-1abc` from
+    # matching `#PROJ-1`; the numeric branch deliberately has no trailing
+    # boundary to preserve historic behaviour for inputs like `#13-blubb`.
+    # rubocop:disable Style/RedundantRegexpEscape
+    WP_REF_RE = /
+      (?:[[:space:],~>\#\(\[\-]|^)\#
+      (?:
+        (\d+)
+        |
+        (#{WorkPackage::SemanticIdentifier::SEMANTIC_ID_PATTERN.source})(?!\w)
+      )
+    /x
+    # rubocop:enable Style/RedundantRegexpEscape
+
     def update_reverse_inline_wiki_page_links(wiki_page)
       provider = Wikis::InternalProvider.enabled.first
       return if provider.nil?
 
       Wikis::ReverseInlinePageLink.where(provider:, identifier: wiki_page.id).delete_all
 
-      find_wp_links(wiki_page.text).uniq.each do |wp_id|
-        wp = WorkPackage.find_by(id: wp_id)
-        next if wp.nil?
+      identifiers = find_wp_links(wiki_page.text).uniq
+      return if identifiers.empty?
 
+      WorkPackage.where_display_id_in(identifiers).find_each do |wp|
         Wikis::ReverseInlinePageLink.create!(linkable: wp, provider:, identifier: wiki_page.id)
       end
     end
@@ -51,9 +66,7 @@ module Wikis::Concerns
     def find_wp_links(text)
       return [] if text.blank?
 
-      # extracted prefix from lib/open_project/text_formatting/matchers/resource_links_matcher.rb
-      # adding # as additional prefix
-      text.scan(/(?:[[:space:],~>#\(\[\-]|^)#([0-9]+)/) # rubocop:disable Style/RedundantRegexpEscape
+      text.scan(WP_REF_RE).map { |numeric, semantic| numeric || semantic }
     end
   end
 end
diff --git a/modules/wikis/config/locales/crowdin/de.yml b/modules/wikis/config/locales/crowdin/de.yml
index 80caa0c13a3..f439d1f8adf 100644
--- a/modules/wikis/config/locales/crowdin/de.yml
+++ b/modules/wikis/config/locales/crowdin/de.yml
@@ -3,7 +3,7 @@ de:
   activerecord:
     attributes:
       wikis/page_link:
-        provider: Wiki Provider
+        provider: Wiki-Anbieter
       wikis/xwiki_provider:
         authentication_method: Authentifizierungsmethode
         authentication_methods:
@@ -29,7 +29,7 @@ de:
   wikis:
     buttons:
       connect_account: "%{provider}-Konto verbinden"
-      done_continue: Fertig, Fortfahren
+      done_continue: Fertig, fortfahren
       save_and_continue: Speichern und fortsetzen
       wiki_page: Wiki-Seite
     work_package_wikis_tab_component:
@@ -58,18 +58,18 @@ de:
         oauth_client_form_component:
           client_id: Client-ID
       oauth_application_info_component:
-        confirm_replace_oauth_application: Diese Aktion setzt die aktuellen OAuth-Anmeldedaten zurück. Nach der Bestätigung müssen Sie die Anmeldedaten erneut in Ihre XWiki-Instanz eingeben und alle Benutzer müssen sich erneut autorisieren. Sind Sie sicher, dass Sie fortfahren möchten?
+        confirm_replace_oauth_application: Diese Aktion setzt die aktuellen OAuth-Anmeldedaten zurück. Nach der Bestätigung müssen Sie die Anmeldedaten erneut in Ihre XWiki-Instanz eingeben und alle Konten müssen sich erneut autorisieren. Sind Sie sicher, dass Sie fortfahren möchten?
         label_pending: Ausstehend
         replace_oauth_application: OpenProject OAuth-Anwendung ersetzen
       oauth_client_info_component:
-        confirm_replace_oauth_client: Diese Aktion setzt die aktuellen XWiki OAuth-Anmeldedaten zurück. Alle Benutzer müssen sich erneut bei XWiki autorisieren. Sind Sie sicher, dass Sie fortfahren möchten?
+        confirm_replace_oauth_client: Diese Aktion setzt die aktuellen XWiki OAuth-Zugangsdaten zurück. Alle Konten müssen sich erneut gegenüber XWiki autorisieren. Sind Sie sicher, dass Sie fortfahren möchten?
         label_pending: Ausstehend
         replace_oauth_client: XWiki OAuth-Anwendung ersetzen
       wiki_provider_list_component:
         label_creation_time: Angelegt
         label_name: Name
         label_provider: Anbieter
-        no_results_description: Fügen Sie einen Anbieter hinzu, um sie hier zu sehen.
+        no_results_description: Wiki-Anbieter hinzufügen, um sie hier anzuzeigen.
         no_results_title: Sie haben noch keine Wiki-Anbieter eingerichtet.
       wiki_providers:
         index_description: Fügen Sie einen externen Wiki-Dienst hinzu, um Arbeitspakete mit bestehenden Wiki-Seiten zu verknüpfen oder neue Seiten direkt von OpenProject aus zu erstellen.
diff --git a/modules/wikis/config/locales/crowdin/fr.yml b/modules/wikis/config/locales/crowdin/fr.yml
index d5ae54e0b0f..c47c7795758 100644
--- a/modules/wikis/config/locales/crowdin/fr.yml
+++ b/modules/wikis/config/locales/crowdin/fr.yml
@@ -3,7 +3,7 @@ fr:
   activerecord:
     attributes:
       wikis/page_link:
-        provider: Wiki Provider
+        provider: Fournisseur de wiki
       wikis/xwiki_provider:
         authentication_method: Méthode d'authentification
         authentication_methods:
diff --git a/modules/wikis/config/locales/crowdin/hy.yml b/modules/wikis/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..645125c7933
--- /dev/null
+++ b/modules/wikis/config/locales/crowdin/hy.yml
@@ -0,0 +1,99 @@
+---
+hy:
+  activerecord:
+    attributes:
+      wikis/page_link:
+        provider: Wiki Provider
+      wikis/xwiki_provider:
+        authentication_method: Authentication method
+        authentication_methods:
+          oauth2_sso: Single-Sign-On through OpenID Connect Identity Provider
+          two_way_oauth2: Two-way OAuth 2.0 authorization code flow
+        name: Name
+        token_exchange_scope: XWiki Scope
+        universal_identifier: Universal identifier
+        url: Instance URL
+        wiki_audience: XWiki Audience
+    errors: {}
+    models:
+      wikis/inline_page_link:
+        one: Inline page link
+        other: Inline page links
+      wikis/internal_provider: Internal wiki
+      wikis/relation_page_link:
+        one: Relation page link
+        other: Relation page links
+      wikis/xwiki_provider: XWiki provider
+  permission_manage_wiki_page_links: Manage Wiki Page Links
+  project_module_wiki_platforms: Wiki providers
+  wikis:
+    buttons:
+      connect_account: Connect %{provider} account
+      done_continue: Done, continue
+      save_and_continue: Save and continue
+      wiki_page: Wiki page
+    work_package_wikis_tab_component:
+      inline_page_links: Inline page links
+      referencing_pages: Referenced in
+    page_link_component:
+      remove: Remove page link
+    relation_page_links_component:
+      empty_heading: No related pages
+      empty_text: Manually add links to other related wiki pages.
+    oauth_login_component:
+      heading: Not connected to %{provider}
+      description: Log in to %{provider} to view and manage related wiki pages from this OpenProject instance.
+      connect_button: Connect %{provider} account
+    admin:
+      destroy_confirmation_dialog_component:
+        title: Delete wiki provider
+        heading: Delete wiki provider?
+        warning_html: You are about to delete %{wiki_provider}. This action is irreversible.
+      forms:
+        general_info_form_component:
+          xwiki_instance_description: Please make sure you have administration privileges in your XWiki instance before doing the setup.
+        oauth_application_form_component:
+          application_id: Application ID
+          application_secret: Application secret
+        oauth_client_form_component:
+          client_id: Client ID
+      oauth_application_info_component:
+        confirm_replace_oauth_application: This action will reset the current OAuth credentials. After confirming you will have to reenter the credentials in your XWiki instance and all users will have to reauthorize. Are you sure you want to proceed?
+        label_pending: Pending
+        replace_oauth_application: Replace OpenProject OAuth application
+      oauth_client_info_component:
+        confirm_replace_oauth_client: This action will reset the current XWiki OAuth credentials. All users will need to reauthorize against XWiki. Are you sure you want to proceed?
+        label_pending: Pending
+        replace_oauth_client: Replace XWiki OAuth application
+      wiki_provider_list_component:
+        label_creation_time: Created
+        label_name: Name
+        label_provider: Provider
+        no_results_description: Add a wiki provider to see them here.
+        no_results_title: You don't have any wiki providers set up yet.
+      wiki_providers:
+        index_description: Add an external wiki service to link work packages to existing wiki pages or create new ones directly from OpenProject.
+        label_add_new: Add new wiki provider
+        label_edit: Edit XWiki provider
+        label_new_xwiki_instance: New XWiki provider
+        label_wiki_platform: Wiki provider
+        name_caption: Give your storage a name so that users can differentiate between multiple wiki platforms.
+        name_placeholder: XWiki knowledge base
+        new_provider_html: Read our documentation on [setting up an XWiki integration](docs_url) for more information.
+        oauth:
+          openproject_oauth: OpenProject OAuth
+        sections:
+          general_information: Basic details
+          oauth_configuration: OAuth configuration
+        url_caption: Please add the host address of your wiki platform including the https://. It should not be longer than 255 characters.
+        xwiki_instance: XWiki Instance
+        xwiki:
+          oauth:
+            openproject_oauth_description: Allow XWiki to access OpenProject data using an OAuth application. Copy the credentials below into your XWiki instance.
+            provider_oauth: XWiki OAuth
+            provider_oauth_description: Allow OpenProject to access XWiki data using OAuth. A client ID is automatically generated to identify OpenProject to XWiki — no manual configuration is needed on the XWiki side.
+          openproject_oauth_description: Allow XWiki to access OpenProject data using an OAuth.
+          xwiki_oauth: XWiki OAuth
+          xwiki_oauth_description: Allow OpenProject to access XWiki data using an OAuth.
+    macro:
+      page_not_found: Linked wiki page no longer available
diff --git a/modules/wikis/config/locales/crowdin/js-hy.yml b/modules/wikis/config/locales/crowdin/js-hy.yml
new file mode 100644
index 00000000000..92a10c3d191
--- /dev/null
+++ b/modules/wikis/config/locales/crowdin/js-hy.yml
@@ -0,0 +1,27 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# See COPYRIGHT and LICENSE files for more details.
+#++
+---
+hy:
+  js:
+    work_packages:
+      tabs:
+        wikis: Wikis
diff --git a/modules/wikis/config/locales/crowdin/pt-BR.yml b/modules/wikis/config/locales/crowdin/pt-BR.yml
index 47955190bb2..84fe96cc3c5 100644
--- a/modules/wikis/config/locales/crowdin/pt-BR.yml
+++ b/modules/wikis/config/locales/crowdin/pt-BR.yml
@@ -3,7 +3,7 @@ pt-BR:
   activerecord:
     attributes:
       wikis/page_link:
-        provider: Wiki Provider
+        provider: Provedor do Wiki
       wikis/xwiki_provider:
         authentication_method: Método de autenticação
         authentication_methods:
diff --git a/modules/wikis/config/locales/crowdin/ru.yml b/modules/wikis/config/locales/crowdin/ru.yml
index 5098fef1cb1..4fdd57d1c4e 100644
--- a/modules/wikis/config/locales/crowdin/ru.yml
+++ b/modules/wikis/config/locales/crowdin/ru.yml
@@ -3,7 +3,7 @@ ru:
   activerecord:
     attributes:
       wikis/page_link:
-        provider: Wiki Provider
+        provider: Провайдер Wiki
       wikis/xwiki_provider:
         authentication_method: Метод аутентификации
         authentication_methods:
diff --git a/modules/wikis/frontend/module/main.ts b/modules/wikis/frontend/module/main.ts
index f4f5ebbd8e6..695c1ae67ea 100644
--- a/modules/wikis/frontend/module/main.ts
+++ b/modules/wikis/frontend/module/main.ts
@@ -24,7 +24,7 @@
 //
 // See COPYRIGHT and LICENSE files for more details.
 
-import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule, inject } from '@angular/core';
 
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { OpSharedModule } from 'core-app/shared/shared.module';
@@ -65,7 +65,9 @@ export function initializeWikiPlugin(injector:Injector) {
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class PluginModule {
-  constructor(injector:Injector) {
+  constructor() {
+    const injector = inject(Injector);
+
     initializeWikiPlugin(injector);
   }
 }
diff --git a/modules/wikis/frontend/module/wikis-tab/wikis-tab.component.ts b/modules/wikis/frontend/module/wikis-tab/wikis-tab.component.ts
index 6a40bfdc7cf..3e7010a4637 100644
--- a/modules/wikis/frontend/module/wikis-tab/wikis-tab.component.ts
+++ b/modules/wikis/frontend/module/wikis-tab/wikis-tab.component.ts
@@ -26,7 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, inject } from '@angular/core';
 
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { TabComponent } from 'core-app/features/work-packages/components/wp-tabs/components/wp-tab-wrapper/tab';
@@ -40,15 +40,13 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
   standalone: false,
 })
 export class WikisTabComponent implements OnInit, TabComponent {
+  private elementRef = inject(ElementRef);
+  readonly PathHelper = inject(PathHelperService);
+  readonly I18n = inject(I18nService);
+
   @Input() public workPackage:WorkPackageResource;
   turboFrameSrc:string;
 
-  constructor(
-    private elementRef:ElementRef,
-    readonly PathHelper:PathHelperService,
-    readonly I18n:I18nService,
-  ) {}
-
   ngOnInit():void {
     this.turboFrameSrc = `${this.PathHelper.projectWorkPackagePath(this.workPackage.project.id as string, this.workPackage.id as string)}/wikis/tab`;
   }
diff --git a/modules/wikis/lib/open_project/wikis/engine.rb b/modules/wikis/lib/open_project/wikis/engine.rb
index aa9cd4e8ce8..858d51a38de 100644
--- a/modules/wikis/lib/open_project/wikis/engine.rb
+++ b/modules/wikis/lib/open_project/wikis/engine.rb
@@ -94,7 +94,7 @@ module OpenProject::Wikis
            { controller: "/wikis/admin/wiki_providers", action: :index },
            if: ->(_) { OpenProject::FeatureDecisions.wiki_enhancements_active? },
            caption: :project_module_wiki_platforms,
-           icon: "browser"
+           icon: "book"
     end
 
     patch_with_namespace :WikiPages, :CreateService
diff --git a/modules/wikis/spec/services/wiki_pages/create_service_spec.rb b/modules/wikis/spec/services/wiki_pages/create_service_spec.rb
index 85b051128ec..b75c34650be 100644
--- a/modules/wikis/spec/services/wiki_pages/create_service_spec.rb
+++ b/modules/wikis/spec/services/wiki_pages/create_service_spec.rb
@@ -179,6 +179,20 @@ RSpec.describe WikiPages::CreateService do
     end
   end
 
+  context "when a numeric reference is immediately followed by alphanumeric text" do
+    # The numeric branch of WP_REF_RE has no trailing `(?!\w)` boundary —
+    # historic behaviour matches `#13` inside `#13-blubb` and similar
+    # shapes. Locked here so a future tightening of the boundary can't
+    # silently strip reverse-links from existing wiki content.
+    let(:text) { "Trailing: ##{work_package.id}abc" }
+
+    it "still creates a reverse page link from the numeric prefix" do
+      subject
+
+      expect(reverse_link_finder.count).to eq(1)
+    end
+  end
+
   context "when the internal provider is disabled" do
     let(:internal_provider) { create(:internal_wiki_provider, enabled: false) }
 
@@ -202,4 +216,124 @@ RSpec.describe WikiPages::CreateService do
       expect(Wikis::ReverseInlinePageLink.count).to eq(0)
     end
   end
+
+  context "with a semantic-identifier reference",
+          with_flag: { semantic_work_package_ids: true },
+          with_settings: { work_packages_identifier: "semantic" } do
+    let(:project) { create(:project, :semantic) }
+    let(:work_package) do
+      create(:work_package, project:).tap do |wp|
+        wp.allocate_and_register_semantic_id
+        wp.reload
+      end
+    end
+
+    context "when the reference uses the semantic identifier" do
+      let(:text) { "See ##{work_package.identifier} for context." }
+
+      it "creates a reverse page link" do
+        subject
+
+        expect(reverse_link_finder.count).to eq(1)
+      end
+    end
+
+    context "when the semantic reference uses the ## widget syntax" do
+      let(:text) { "Block: ###{work_package.identifier}." }
+
+      it "creates a reverse page link" do
+        subject
+
+        expect(reverse_link_finder.count).to eq(1)
+      end
+    end
+
+    context "when the semantic reference uses the ### widget syntax" do
+      let(:text) { "Detailed: ####{work_package.identifier}." }
+
+      it "creates a reverse page link" do
+        subject
+
+        expect(reverse_link_finder.count).to eq(1)
+      end
+    end
+
+    context "when the project has been renamed and a historical alias is referenced" do
+      let(:text) { "Historical: #OLD-#{work_package.sequence_number}." }
+
+      before do
+        WorkPackageSemanticAlias.create!(work_package:, identifier: "OLD-#{work_package.sequence_number}")
+      end
+
+      it "still creates a reverse page link" do
+        subject
+
+        expect(reverse_link_finder.count).to eq(1)
+      end
+    end
+
+    context "when no work package matches the semantic reference" do
+      let(:text) { "Missing: #GHOST-99." }
+
+      it "does not create a link" do
+        subject
+
+        expect(Wikis::ReverseInlinePageLink.count).to eq(0)
+      end
+    end
+
+    context "when the semantic identifier is followed by an alphanumeric word character" do
+      let(:text) { "Boundary: ##{work_package.identifier}abc." }
+
+      it "does not create a link" do
+        subject
+
+        expect(Wikis::ReverseInlinePageLink.count).to eq(0)
+      end
+    end
+
+    context "when the body mixes a numeric and a semantic reference" do
+      let(:numeric_work_package) { create(:work_package) }
+      let(:text) do
+        "Mixed: ##{numeric_work_package.id} and ##{work_package.identifier}."
+      end
+
+      it "creates a reverse page link per referenced work package" do
+        subject
+
+        wiki_page = WikiPage.first
+        links = Wikis::ReverseInlinePageLink.where(provider: internal_provider, identifier: wiki_page.id)
+        expect(links.pluck(:linkable_id)).to contain_exactly(numeric_work_package.id, work_package.id)
+      end
+    end
+
+    context "when several reference shapes resolve to the same work package" do
+      let(:text) do
+        "Triple: ##{work_package.id}, ##{work_package.identifier}, #OLD-#{work_package.sequence_number}."
+      end
+
+      before do
+        WorkPackageSemanticAlias.create!(work_package:, identifier: "OLD-#{work_package.sequence_number}")
+      end
+
+      it "creates a single reverse page link" do
+        subject
+
+        expect(reverse_link_finder.count).to eq(1)
+        expect(reverse_link_finder.first.linkable).to eq(work_package)
+      end
+    end
+  end
+
+  context "with a semantic-shape reference in classic mode",
+          with_flag: { semantic_work_package_ids: false },
+          with_settings: { work_packages_identifier: "classic" } do
+    let(:text) { "See #PROJ-1 for context." }
+
+    it "does not create a link" do
+      subject
+
+      expect(Wikis::ReverseInlinePageLink.count).to eq(0)
+    end
+  end
 end
diff --git a/modules/wikis/spec/spec_helper.rb b/modules/wikis/spec/spec_helper.rb
index 72f308d2e31..d597b3f40aa 100644
--- a/modules/wikis/spec/spec_helper.rb
+++ b/modules/wikis/spec/spec_helper.rb
@@ -28,7 +28,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require "dry/container/stub"
+require "dry/core/container/stub"
 require "dry/monads"
 
 RSpec.configure do |config|
diff --git a/modules/xls_export/config/locales/crowdin/hy.yml b/modules/xls_export/config/locales/crowdin/hy.yml
new file mode 100644
index 00000000000..7542dab5c19
--- /dev/null
+++ b/modules/xls_export/config/locales/crowdin/hy.yml
@@ -0,0 +1,17 @@
+---
+hy:
+  plugin_openproject_xls_export:
+    name: OpenProject XLS Export
+    description: Export issue lists as Excel spreadsheets (.xls).
+  export_to_excel: Export XLS
+  print_with_description: Print preview with description
+  sentence_separator_or: or
+  different_formats: Different formats
+  export:
+    format:
+      xls: XLS
+      xls_with_descriptions: XLS with descriptions
+      xls_with_relations: XLS with relations
+  xls_export:
+    child_of: child of
+    parent_of: parent of
diff --git a/package-lock.json b/package-lock.json
index 4c393830668..6a27a9ab135 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -399,11 +399,10 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.1.tgz",
+      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
+      "dev": true
     },
     "node_modules/@redocly/ajv": {
       "version": "8.17.4",
diff --git a/publiccode.yml b/publiccode.yml
index 8d1cb870969..d76300c1325 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -7,8 +7,8 @@ name: OpenProject
 applicationSuite: openDesk
 url: 'https://github.com/opf/openproject'
 roadmap: 'https://www.openproject.org/roadmap'
-releaseDate: '2026-04-20'
-softwareVersion: '17.3.1'
+releaseDate: '2026-05-13'
+softwareVersion: '17.4.0'
 developmentStatus: stable
 softwareType: standalone/web
 logo: 'publiccode_logo.svg'
diff --git a/script/ci/docker_validate_image.sh b/script/ci/docker_validate_image.sh
index 47302be2095..ec6fd231988 100755
--- a/script/ci/docker_validate_image.sh
+++ b/script/ci/docker_validate_image.sh
@@ -242,6 +242,7 @@ validate_all_in_one() {
     -p "${VALIDATION_PORT}:80"
     -e SUPERVISORD_LOG_LEVEL=debug
     -e OPENPROJECT_LOGIN__REQUIRED=false
+    -e SECRET_KEY_BASE=eijai2ii3aithieJ4teez7Gavae4chai
     -e OPENPROJECT_HTTPS=false
   )
 
diff --git a/script/docs/check_links b/script/docs/check_links
index ccf1801e266..0b695c84108 100755
--- a/script/docs/check_links
+++ b/script/docs/check_links
@@ -138,12 +138,12 @@ class DocsChecker
   end
 
   def add_virtual_pages
-    # these pages are added by the website from other sources
+    # these pages are added to the website from other sources
     @docs.push(
       { path: "#{@root_path}/docs/api/v3/spec.json", anchors: [], links: [] },
       { path: "#{@root_path}/docs/api/v3/spec.yml", anchors: [], links: [] },
       { path: "#{@root_path}/docs/installation-and-operations/installation/docker-compose", anchors: [], links: [] },
-      { path: "#{@root_path}/docs/installation-and-operations/installation/helm-chart", anchors: [], links: [] },
+      { path: "#{@root_path}/docs/installation-and-operations/installation/helm-chart", anchors: ['secrets'], links: [] },
       { path: "#{@root_path}/docs/development/security", anchors: [], links: [] },
       { path: "#{@root_path}/docs/development/translate-openproject/fair-language", anchors: [], links: [] }
     )
@@ -184,9 +184,19 @@ class DocsChecker
     uri unless %w[mailto https http].include?(uri.scheme)
   end
 
+  def readme_link_error(uri, link, doc)
+    return unless uri.path&.end_with?("/README.md") || uri.path == "README.md"
+
+    suggested = uri.path.delete_suffix("README.md")
+    suggested += "##{uri.fragment}" unless uri.fragment.nil?
+    { error: "ReadmeLink", message: "Link to README.md not allowed, use `#{suggested}` instead of `#{link[:url]}`", link:, doc: }
+  end
+
   def check_doc_link(link, doc)
     uri = parse_uri(link, doc)
-    error = check_link(uri, link, doc) unless uri.nil?
+    return if uri.nil?
+
+    error = readme_link_error(uri, link, doc) || check_link(uri, link, doc)
     @errors.push(error) unless error.nil?
   end
 
@@ -203,11 +213,12 @@ class DocsChecker
   def report
     @errors.each do |error|
       pos = error[:link][:pos]
+      message = error[:message] || "#{error[:error]} not found for link address `#{error[:link][:url]}`"
       report_item(
         "error",
         error[:doc][:filename],
         pos[:start_line], pos[:start_column], pos[:end_line], pos[:end_column],
-        "#{error[:error]} not found for link address `#{error[:link][:url]}`"
+        message
       )
     end
     puts "Done. No broken references found." if @errors.empty?
diff --git a/spec/components/open_project/common/border_box_list_component_spec.rb b/spec/components/open_project/common/border_box_list_component_spec.rb
new file mode 100644
index 00000000000..c072dc586cf
--- /dev/null
+++ b/spec/components/open_project/common/border_box_list_component_spec.rb
@@ -0,0 +1,770 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe OpenProject::Common::BorderBoxListComponent, type: :component do
+  shared_let(:user) { create(:admin) }
+  shared_let(:project) { create(:project) }
+  shared_let(:work_package) { create(:work_package, subject: "Default WP", project:) }
+  shared_let(:override_work_package) { create(:work_package, subject: "Override WP", project:) }
+
+  current_user { user }
+
+  let(:default_wp_item_class) do
+    stub_const(
+      "TestDefaultWorkPackageItem",
+      Class.new(ApplicationComponent) do
+        include ActionView::RecordIdentifier
+
+        delegate :with_metric, :with_menu, to: :card
+
+        def initialize(work_package:, project:, container:, params: {}, current_user: User.current, **system_arguments) # rubocop:disable Lint/UnusedMethodArgument
+          super()
+
+          @work_package = work_package
+          @project = project
+          @container = container
+          @current_user = current_user
+          @system_arguments = system_arguments
+        end
+
+        def row_args
+          @system_arguments.merge(
+            id: "default_wp_#{@work_package.id}",
+            data: @system_arguments.fetch(:data, {}).merge(
+              container: Array(@container).map { |c| c.respond_to?(:id) ? c.id : c }.join("_"),
+              project: @project&.id,
+              current_user: @current_user&.id
+            )
+          )
+        end
+
+        def card
+          @card ||= TestWorkPackageCard.new(prefix: "default", subject: @work_package.subject)
+        end
+
+        def before_render
+          content
+        end
+
+        def call
+          render(card)
+        end
+      end
+    )
+  end
+
+  let(:override_wp_item_class) do
+    stub_const(
+      "TestOverrideWorkPackageItem",
+      Class.new(default_wp_item_class) do
+        def row_args
+          super.merge(id: "override_wp_#{@work_package.id}")
+        end
+
+        def card
+          @card ||= TestWorkPackageCard.new(prefix: "override", subject: @work_package.subject)
+        end
+      end
+    )
+  end
+
+  before do
+    stub_const(
+      "TestWorkPackageCard",
+      Class.new(ApplicationComponent) do
+        renders_one :metric
+        renders_one :menu
+
+        def initialize(prefix:, subject:)
+          super()
+
+          @prefix = prefix
+          @subject = subject
+        end
+
+        def call
+          safe_join([tag.span("#{@prefix} #{@subject}"), metric, menu].compact)
+        end
+      end
+    )
+  end
+
+  describe "full rendering" do
+    subject(:rendered_component) do
+      render_inline(
+        described_class.new(container: "test-list", current_user: user)
+      ) do |list|
+        list.with_header(title: "Header title", count: 3)
+        list.with_item(id: "manual-item") { "Manual item" }
+        list.with_work_package_item(
+          work_package:,
+          component_klass: default_wp_item_class,
+          data: { source: "slot" }
+        ) do |item|
+          item.card.with_metric { "Metric content" }
+        end
+        list.with_work_package_item(
+          work_package: override_work_package,
+          component_klass: override_wp_item_class
+        ) do |item|
+          item.with_menu { "Menu content" }
+        end
+        list.with_footer { "Footer content" }
+      end
+    end
+
+    it_behaves_like "rendering Box", row_count: 3, header: true, footer: true
+
+    it "renders the header with title" do
+      expect(rendered_component).to have_heading("Header title", level: 4)
+    end
+
+    it "renders the header count badge" do
+      expect(rendered_component).to have_css(".Counter", text: "3")
+    end
+
+    it "renders generic items as content rows" do
+      expect(rendered_component).to have_css(".Box-row#manual-item", text: "Manual item")
+    end
+
+    it "renders the footer" do
+      expect(rendered_component).to have_css(".Box-footer", text: "Footer content")
+    end
+
+    it "renders the default work-package item" do
+      expect(rendered_component).to have_css(
+        ".Box-row#default_wp_#{work_package.id}",
+        text: "default Default WP"
+      )
+    end
+
+    it "renders the overridden work-package item" do
+      expect(rendered_component).to have_css(
+        ".Box-row#override_wp_#{override_work_package.id}",
+        text: "override Override WP"
+      )
+    end
+
+    it "captures work-package item customization blocks" do
+      expect(rendered_component).to have_text("Metric content")
+    end
+
+    it "delegates menu customization to the card" do
+      expect(rendered_component).to have_text("Menu content")
+    end
+  end
+
+  describe "header" do
+    it "renders a description below the title" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-test")
+      ) do |list|
+        list.with_header(title: "My title") do |header|
+          header.with_description { "Some description" }
+        end
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_heading("My title", level: 4)
+      expect(rendered).to have_text("Some description")
+    end
+
+    it "renders multiple action buttons" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-actions")
+      ) do |list|
+        list.with_header(title: "Actions") do |header|
+          header.with_action_button(scheme: :primary) { "Add" }
+          header.with_action_button(scheme: :default) { "Edit" }
+        end
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_button("Add")
+      expect(rendered).to have_button("Edit")
+    end
+
+    it "renders a menu in the header" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-menu")
+      ) do |list|
+        list.with_header(title: "With menu") do |header|
+          header.with_menu do |menu|
+            menu.with_item(label: "Option A", value: "a")
+          end
+        end
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Box-header")
+      expect(rendered).to have_css("action-menu")
+      expect(rendered).to have_css("tool-tip[data-type='label']", text: I18n.t(:label_actions))
+    end
+
+    it "infers the count from rendered items" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-inferred-count")
+      ) do |list|
+        list.with_header(title: "Counted", count: true)
+        list.with_item { "first row" }
+        list.with_item { "second row" }
+      end
+
+      expect(rendered).to have_css(".Counter", text: "2")
+    end
+
+    it "does not render a count when count is false" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-false-count")
+      ) do |list|
+        list.with_header(title: "Uncounted", count: false)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_no_css(".Counter")
+    end
+
+    it "does not render a count when count is nil" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-nil-count")
+      ) do |list|
+        list.with_header(title: "Uncounted", count: nil)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_no_css(".Counter")
+    end
+
+    it "renders an explicit count" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-explicit-count")
+      ) do |list|
+        list.with_header(title: "Counted", count: 5)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Counter", text: "5")
+    end
+
+    it "keeps zero counts hidden by default" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-zero-count")
+      ) do |list|
+        list.with_header(title: "Counted", count: 0)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Counter[hidden]", text: "0", visible: :all)
+    end
+
+    it "allows zero counts to be shown through count arguments" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-visible-zero-count")
+      ) do |list|
+        list.with_header(title: "Counted", count: 0, count_arguments: { hide_if_zero: false })
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Counter:not([hidden])", text: "0")
+    end
+
+    it "sets a default aria-label on the counter" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-default-aria")
+      ) do |list|
+        list.with_header(title: "Counted", count: 5)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(
+        ".Counter",
+        text: "5",
+        aria: { label: I18n.t(:label_x_items, count: 5), live: nil }
+      )
+    end
+
+    it "adds aria-live to the counter when the list is interactive" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-interactive-aria", interactive: true)
+      ) do |list|
+        list.with_header(title: "Counted", count: 5)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(
+        ".Counter",
+        text: "5",
+        aria: { label: I18n.t(:label_x_items, count: 5), live: "polite" }
+      )
+    end
+
+    it "preserves caller-provided counter aria attributes" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-custom-counter-aria", interactive: true)
+      ) do |list|
+        list.with_header(
+          title: "Counted",
+          count: 5,
+          count_arguments: { aria: { describedby: "counter-help", live: "assertive" } }
+        )
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(
+        ".Counter",
+        text: "5",
+        aria: {
+          label: I18n.t(:label_x_items, count: 5),
+          describedby: "counter-help",
+          live: "assertive"
+        }
+      )
+    end
+
+    it "uses the default aria-label when count is inferred" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-inferred-aria")
+      ) do |list|
+        list.with_header(title: "Counted", count: true)
+        list.with_item { "one" }
+        list.with_item { "two" }
+      end
+
+      expect(rendered).to have_css(
+        ".Counter",
+        text: "2",
+        aria: { label: I18n.t(:label_x_items, count: 2) }
+      )
+    end
+
+    it "allows count_label to override the default aria-label" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-custom-label")
+      ) do |list|
+        list.with_header(title: "Counted", count: 3, count_label: "3 work packages")
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(
+        ".Counter",
+        text: "3",
+        aria: { label: "3 work packages" }
+      )
+    end
+
+    it "allows the title tag to be customized" do
+      rendered = render_inline(
+        described_class.new(container: "hdr-title-tag")
+      ) do |list|
+        list.with_header(title: "Custom title", title_tag: :h3)
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_heading("Custom title", level: 3)
+    end
+  end
+
+  describe "header collapsible behavior" do
+    it "sets collapsible_id from list and footer ids" do
+      rendered = render_inline(
+        described_class.new(container: "collapse-test", collapsible: true)
+      ) do |list|
+        list.with_header(title: "Collapsible")
+        list.with_item { "row" }
+        list.with_footer { "foot" }
+      end
+
+      list_id = "collapse-test_list"
+      footer_id = "collapse-test_footer"
+
+      expect(rendered).to have_css(
+        "[aria-controls='#{list_id} #{footer_id}']"
+      )
+    end
+
+    it "sets collapsible_id from list id only when no footer" do
+      rendered = render_inline(
+        described_class.new(container: "collapse-no-footer", collapsible: true)
+      ) do |list|
+        list.with_header(title: "No footer")
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(
+        "[aria-controls='collapse-no-footer_list']"
+      )
+    end
+  end
+
+  describe "generic items" do
+    subject(:rendered_component) do
+      render_inline(
+        described_class.new(container: "generic-items")
+      ) do |list|
+        list.with_item(id: "row-1") { "First" }
+        list.with_item(id: "row-2") { "Second" }
+      end
+    end
+
+    it "renders content block rows" do
+      expect(rendered_component).to have_css(".Box-row#row-1", text: "First")
+      expect(rendered_component).to have_css(".Box-row#row-2", text: "Second")
+    end
+
+    it "renders the expected number of rows" do
+      expect(rendered_component).to have_css(".Box-row", count: 2)
+    end
+  end
+
+  describe "work-package items" do
+    describe "with the default WorkPackageItem" do
+      subject(:rendered_component) do
+        render_inline(
+          described_class.new(container: "wp-default", current_user: user)
+        ) do |list|
+          list.with_work_package_item(work_package:)
+        end
+      end
+
+      it "renders the work package row" do
+        expect(rendered_component).to have_css(
+          ".Box-row#work_package_#{work_package.id}"
+        )
+      end
+
+      it "applies clickable row classes" do
+        expect(rendered_component).to have_css(
+          ".Box-row.Box-row--clickable"
+        )
+      end
+
+      it "sets the test selector" do
+        item = described_class::WorkPackageItem.new(
+          work_package:,
+          project:,
+          container: "wp-default",
+          current_user: user
+        )
+
+        expect(item.row_args[:test_selector]).to eq("work-package-#{work_package.id}")
+        expect(rendered_component).to have_css(
+          ".Box-row[data-test-selector='work-package-#{work_package.id}']"
+        )
+      end
+
+      it "delegates metric customization to the work-package card" do
+        rendered = render_inline(
+          described_class.new(container: "wp-default-metric", current_user: user)
+        ) do |list|
+          list.with_work_package_item(work_package:) do |item|
+            item.with_metric { "Custom metric" }
+          end
+        end
+
+        expect(rendered).to have_text("Custom metric")
+      end
+    end
+
+    describe "with an overridden component_klass" do
+      subject(:rendered_component) do
+        render_inline(
+          described_class.new(container: "wp-override", current_user: user)
+        ) do |list|
+          list.with_work_package_item(
+            work_package: override_work_package,
+            component_klass: override_wp_item_class
+          )
+        end
+      end
+
+      it "uses the provided component class" do
+        expect(rendered_component).to have_css(
+          ".Box-row#override_wp_#{override_work_package.id}",
+          text: "override Override WP"
+        )
+      end
+    end
+
+    describe "injected container: and current_user:" do
+      subject(:rendered_component) do
+        render_inline(
+          described_class.new(container: "injection-test", current_user: user)
+        ) do |list|
+          list.with_work_package_item(
+            work_package:,
+            component_klass: default_wp_item_class
+          )
+        end
+      end
+
+      it "injects the list container into the item" do
+        expect(rendered_component).to have_css(
+          ".Box-row[data-container='injection-test']"
+        )
+      end
+
+      it "injects the list current_user into the item" do
+        expect(rendered_component).to have_css(
+          ".Box-row[data-current-user='#{user.id}']"
+        )
+      end
+    end
+
+    describe "project defaults to work_package.project" do
+      subject(:rendered_component) do
+        render_inline(
+          described_class.new(container: "project-default", current_user: user)
+        ) do |list|
+          list.with_work_package_item(
+            work_package:,
+            component_klass: default_wp_item_class
+          )
+        end
+      end
+
+      it "passes the work package's project when project: is omitted" do
+        expect(rendered_component).to have_css(
+          ".Box-row[data-project='#{work_package.project.id}']"
+        )
+      end
+    end
+  end
+
+  describe "empty state" do
+    it "renders a Blankslate when no items are present" do
+      rendered = render_inline(
+        described_class.new(container: "empty-list")
+      ) do |list|
+        list.with_empty_state(title: "Nothing here", description: "Add some items", icon: :inbox)
+      end
+
+      expect(rendered).to have_css(".blankslate")
+      expect(rendered).to have_text("Nothing here")
+      expect(rendered).to have_text("Add some items")
+    end
+
+    it "does not render the empty state when items are present" do
+      rendered = render_inline(
+        described_class.new(container: "non-empty-list")
+      ) do |list|
+        list.with_empty_state(title: "Nothing here")
+        list.with_item { "Has content" }
+      end
+
+      expect(rendered).to have_no_css(".blankslate")
+      expect(rendered).to have_text("Has content")
+    end
+
+    it "does not set aria role and live attributes on the empty state by default" do
+      rendered = render_inline(
+        described_class.new(container: "empty-aria")
+      ) do |list|
+        list.with_empty_state(title: "Empty")
+      end
+
+      expect(rendered).to have_no_role(:status)
+      expect(rendered).to have_css(".blankslate", aria: { live: nil })
+    end
+
+    it "sets aria role and live attributes on the empty state when the list is interactive" do
+      rendered = render_inline(
+        described_class.new(container: "empty-interactive-aria", interactive: true)
+      ) do |list|
+        list.with_empty_state(title: "Empty")
+      end
+
+      expect(rendered).to have_role(:status, aria: { live: "polite" })
+    end
+
+    it "preserves caller-provided empty state aria attributes" do
+      rendered = render_inline(
+        described_class.new(container: "empty-custom-aria", interactive: true)
+      ) do |list|
+        list.with_empty_state(
+          title: "Empty",
+          role: "alert",
+          aria: { live: "assertive", describedby: "empty-help" }
+        )
+      end
+
+      expect(rendered).to have_alert(aria: { live: "assertive", describedby: "empty-help" })
+    end
+  end
+
+  describe "footer rendering" do
+    subject(:rendered_component) do
+      render_inline(
+        described_class.new(container: "footer-test")
+      ) do |list|
+        list.with_item { "row" }
+        list.with_footer(classes: "custom-footer") { "Custom footer" }
+      end
+    end
+
+    it "renders as a proper BorderBox footer" do
+      expect(rendered_component).to have_css(".Box-footer", text: "Custom footer")
+    end
+
+    it "auto-derives the footer id from the box id" do
+      expect(rendered_component).to have_css(".Box-footer#footer-test_footer")
+    end
+  end
+
+  describe "container-derived DOM IDs" do
+    context "with a string container" do
+      subject(:rendered_component) do
+        render_inline(
+          described_class.new(container: "my-widget")
+        ) do |list|
+          list.with_item { "row" }
+        end
+      end
+
+      it "derives the box id from container" do
+        expect(rendered_component).to have_css(".Box#my-widget")
+      end
+
+      it "derives the list id from container" do
+        expect(rendered_component).to have_css("ul#my-widget_list")
+      end
+    end
+
+    it "derives the header id from the box id" do
+      rendered = render_inline(
+        described_class.new(container: "my-widget")
+      ) do |list|
+        list.with_header(title: "Header")
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Box-header#my-widget_header")
+    end
+
+    it "derives the header ids when explicit slot ids are provided" do
+      rendered = render_inline(
+        described_class.new(container: "ignored", id: "explicit-box", collapsible: true)
+      ) do |list|
+        list.with_header(title: "Header", id: "explicit-header", list_id: "explicit-list")
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Box-header#explicit-box_header")
+      expect(rendered).to have_element(aria: { controls: "explicit-box_list" })
+      expect(rendered).to have_no_css(".Box-header#explicit-header")
+      expect(rendered).to have_no_element(aria: { controls: "explicit-list" })
+    end
+
+    it "derives the list id from the explicit box id" do
+      rendered = render_inline(
+        described_class.new(container: "ignored", id: "explicit-box", list_id: "explicit-list")
+      ) do |list|
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css(".Box#explicit-box")
+      expect(rendered).to have_css("ul#explicit-box_list")
+      expect(rendered).to have_no_css("ul#explicit-list")
+    end
+
+    it "derives the footer id from the explicit box id" do
+      rendered = render_inline(
+        described_class.new(container: "ignored", id: "explicit-box", collapsible: true)
+      ) do |list|
+        list.with_header(title: "Header")
+        list.with_item { "row" }
+        list.with_footer(id: "explicit-footer") { "footer" }
+      end
+
+      expect(rendered).to have_css(".Box-footer#explicit-box_footer")
+      expect(rendered).to have_no_css(".Box-footer#explicit-footer")
+      expect(rendered).to have_element(aria: { controls: "explicit-box_list explicit-box_footer" })
+    end
+  end
+
+  describe "system arguments forwarded to BorderBox" do
+    subject(:rendered_component) do
+      render_inline(
+        described_class.new(
+          container: "sys-args",
+          classes: "extra-class",
+          data: { test_selector: "my-box" }
+        )
+      ) do |list|
+        list.with_item { "row" }
+      end
+    end
+
+    it "forwards classes to the underlying BorderBox" do
+      expect(rendered_component).to have_css(".Box.extra-class")
+    end
+
+    it "forwards data attributes to the underlying BorderBox" do
+      expect(rendered_component).to have_css(".Box[data-test-selector='my-box']")
+    end
+  end
+
+  describe "constructor requires container:" do
+    it "raises ArgumentError when container: is missing" do
+      expect { described_class.new }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "collapsible" do
+    it "renders a non-collapsible header by default" do
+      rendered = render_inline(
+        described_class.new(container: "no-collapse")
+      ) do |list|
+        list.with_header(title: "Non-collapsible header", count: 3) do |header|
+          header.with_description { "Description text" }
+        end
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_heading("Non-collapsible header", level: 4)
+      expect(rendered).to have_css(".Counter", text: "3")
+      expect(rendered).to have_text("Description text")
+      expect(rendered).to have_no_css("collapsible-header")
+      expect(rendered).to have_no_css("[aria-controls]")
+    end
+
+    it "renders a collapsible header when collapsible is true" do
+      rendered = render_inline(
+        described_class.new(container: "explicit-collapse", collapsible: true)
+      ) do |list|
+        list.with_header(title: "Collapsible header")
+        list.with_item { "row" }
+      end
+
+      expect(rendered).to have_css("collapsible-header")
+    end
+  end
+end
diff --git a/spec/components/open_project/common/work_package_card_list_component/header_spec.rb b/spec/components/open_project/common/work_package_card_list_component/header_spec.rb
deleted file mode 100644
index c00b7d0b957..00000000000
--- a/spec/components/open_project/common/work_package_card_list_component/header_spec.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# frozen_string_literal: true
-
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-require "rails_helper"
-
-RSpec.describe OpenProject::Common::WorkPackageCardListComponent::Header, type: :component do
-  shared_let(:user) { create(:admin) }
-  current_user { user }
-
-  shared_let(:project) { create(:project) }
-  shared_let(:sprint) do
-    create(:sprint, project:, name: "Sprint 1",
-                    start_date: Date.yesterday, finish_date: Date.tomorrow)
-  end
-
-  let(:title) { "Sprint 1" }
-  let(:container) { sprint }
-  let(:list_id) { "sprint_1_list" }
-  let(:count) { 4 }
-  let(:menu_button_id) { "sprint_#{sprint.id}_menu-button" }
-
-  subject(:rendered_component) do
-    render_component
-  end
-
-  def render_component(&)
-    render_inline(described_class.new(title:, container:, list_id:, count:), &)
-  end
-
-  describe "kwargs-only render" do
-    it "renders the title in the collapsible header" do
-      expect(rendered_component).to have_heading "Sprint 1", level: 4
-    end
-
-    it "renders the count badge" do
-      expect(rendered_component).to have_css ".Counter", text: "4"
-    end
-
-    it "passes the provided list id to the collapsible trigger" do
-      expect(rendered_component).to have_css ".CollapsibleHeader-triggerArea", aria: { controls: "sprint_1_list" }
-    end
-
-    it "uses the work-package-count aria label on the count badge" do
-      expect(rendered_component).to have_css ".Counter", text: "4", aria: { label: "4 work packages" }
-    end
-  end
-
-  describe ":description slot" do
-    subject(:rendered_component) do
-      render_component do |header|
-        header.with_description { "extra-bit" }
-      end
-    end
-
-    it "renders inside the description region" do
-      expect(rendered_component).to have_text("extra-bit")
-    end
-  end
-
-  describe ":actions slots" do
-    subject(:rendered_component) do
-      render_component do |header|
-        header.with_action_button(id: "start-btn", scheme: :primary) { "Start" }
-        header.with_action_button(id: "finish-btn", scheme: :invisible) { "Finish" }
-      end
-    end
-
-    it "renders buttons into the actions grid area" do
-      expect(rendered_component).to have_button "Start"
-      expect(rendered_component).to have_button "Finish"
-    end
-  end
-
-  describe ":menu slot" do
-    subject(:rendered_component) do
-      render_component do |header|
-        header.with_menu(**menu_arguments) { |menu| menu.with_item(label: "Edit", href: "/x") }
-      end
-    end
-
-    let(:count) { 1 }
-    let(:menu_arguments) { {} }
-
-    it "renders an action-menu" do
-      expect(rendered_component).to have_element :"action-menu"
-    end
-
-    it "uses the standard kebab accessible label" do
-      expect(rendered_component).to have_button menu_button_id, accessible_name: "Open menu"
-    end
-
-    it "defaults menu_id to dom_target(container, :menu)" do
-      expect(rendered_component).to have_button menu_button_id
-    end
-
-    it "applies the hide-when-print class" do
-      expect(rendered_component).to have_element :"action-menu", class: "hide-when-print"
-    end
-
-    context "when a custom aria label is provided" do
-      let(:menu_arguments) { { button_aria_label: "Sprint actions" } }
-
-      it "uses the custom label" do
-        expect(rendered_component).to have_button menu_button_id, accessible_name: "Sprint actions"
-      end
-    end
-  end
-end
diff --git a/spec/components/open_project/common/work_package_card_list_component/item_spec.rb b/spec/components/open_project/common/work_package_card_list_component/item_spec.rb
deleted file mode 100644
index 7d3ec596698..00000000000
--- a/spec/components/open_project/common/work_package_card_list_component/item_spec.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-# frozen_string_literal: true
-
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-require "rails_helper"
-
-RSpec.describe OpenProject::Common::WorkPackageCardListComponent::Item, type: :component do
-  shared_let(:type_feature) { create(:type_feature) }
-  shared_let(:default_status) { create(:default_status) }
-  shared_let(:default_priority) { create(:default_priority) }
-  shared_let(:user) { create(:admin) }
-  current_user { user }
-
-  shared_let(:project) { create(:project, types: [type_feature]) }
-
-  let(:container) { project }
-  let(:params) { {} }
-  let(:work_package) do
-    create(:work_package,
-           project:,
-           type: type_feature,
-           status: default_status,
-           priority: default_priority,
-           subject: "Card subject",
-           story_points: 5,
-           position: 1)
-  end
-  let(:item) do
-    described_class.new(work_package:, project:, container:, params:, current_user: user)
-  end
-  let(:draggable_item_class) do
-    stub_const(
-      "DraggableWorkPackageCardListItem",
-      Class.new(described_class) do
-        private
-
-        def draggable?
-          true
-        end
-
-        def draggable_data
-          {
-            draggable_id: work_package.id,
-            draggable_type: "work_package",
-            drop_url: "/drop"
-          }
-        end
-      end
-    )
-  end
-
-  describe "#row_args" do
-    it "can be passed to a BorderBox row" do
-      rendered = render_inline(Primer::Beta::BorderBox.new) do |box|
-        box.with_row(**item.row_args) do
-          "row body"
-        end
-      end
-
-      expect(rendered).to have_css(
-        ".Box-row#work_package_#{work_package.id}",
-        text: "row body"
-      )
-    end
-
-    it "supplies the work-package row attributes" do
-      expect(item.row_args).to include(
-        id: "work_package_#{work_package.id}",
-        tabindex: 0
-      )
-      expect(item.row_args[:classes]).to include(
-        "Box-row--hover-blue",
-        "Box-row--focus-gray",
-        "Box-row--clickable"
-      )
-      expect(item.row_args[:data][:test_selector]).to eq("work-package-#{work_package.id}")
-    end
-
-    it "lets caller-supplied data override default row data" do
-      item = described_class.new(
-        work_package:,
-        project:,
-        container:,
-        params:,
-        current_user: user,
-        data: {
-          story: false,
-          test_selector: "custom-work-package-row"
-        }
-      )
-
-      expect(item.row_args[:data]).to include(
-        story: false,
-        test_selector: "custom-work-package-row"
-      )
-    end
-
-    it "does not include Backlogs row wiring" do
-      expect(item.row_args[:classes]).not_to include("Box-row--draggable")
-      expect(item.row_args[:data]).not_to include(
-        :controller,
-        :draggable_id,
-        :drop_url,
-        :backlogs__story_split_url_value
-      )
-    end
-
-    it "supports generic draggable row data from subclasses" do
-      item = draggable_item_class.new(work_package:, project:, container:, params:, current_user: user)
-
-      expect(item.row_args[:classes]).to include("Box-row--draggable")
-      expect(item.row_args[:data]).to include(
-        draggable_id: work_package.id,
-        draggable_type: "work_package",
-        drop_url: "/drop"
-      )
-    end
-  end
-
-  describe "#card" do
-    subject(:rendered_card) { render_inline(item.card) }
-
-    it "builds the visual card without deriving a menu src" do
-      expect(rendered_card).to have_no_element "include-fragment"
-    end
-
-    it "returns the same card instance across calls" do
-      expect(item.card).to equal(item.card)
-    end
-
-    it "forwards metric content to the visual card" do
-      item.with_metric { "Forwarded metric" }
-
-      expect(rendered_card).to have_text("Forwarded metric")
-    end
-  end
-end
diff --git a/spec/components/open_project/common/work_package_card_list_component_spec.rb b/spec/components/open_project/common/work_package_card_list_component_spec.rb
deleted file mode 100644
index d9b9dbfb9e4..00000000000
--- a/spec/components/open_project/common/work_package_card_list_component_spec.rb
+++ /dev/null
@@ -1,555 +0,0 @@
-# frozen_string_literal: true
-
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-require "rails_helper"
-
-RSpec.describe OpenProject::Common::WorkPackageCardListComponent, type: :component do
-  shared_let(:type_feature) { create(:type_feature) }
-  shared_let(:default_status) { create(:default_status) }
-  shared_let(:default_priority) { create(:default_priority) }
-  shared_let(:user) { create(:admin) }
-  current_user { user }
-
-  shared_let(:project) { create(:project, types: [type_feature]) }
-  shared_let(:sprint) do
-    create(:sprint, project:, name: "Sprint 1",
-                    start_date: Date.yesterday, finish_date: Date.tomorrow)
-  end
-  shared_let(:backlog_bucket) { create(:backlog_bucket, project:, name: "Bucket A") }
-
-  let(:container) { sprint }
-  let(:drag_and_drop) { nil }
-  let(:item_component_klass) { described_class::Item }
-  let(:params) { {} }
-  let(:work_packages) { [] }
-  let(:system_arguments) { {} }
-  let(:header_arguments) { nil }
-  let(:footer_content) { nil }
-
-  let(:custom_item_component_class) do
-    stub_const(
-      "CustomWorkPackageCardListItem",
-      Class.new(ApplicationComponent) do
-        def initialize(
-          work_package:,
-          project:,
-          container:,
-          params:,
-          current_user: User.current,
-          **system_arguments
-        )
-          super()
-
-          @work_package = work_package
-          @params = params
-          @context = [project, container, current_user]
-          @system_arguments = system_arguments
-        end
-
-        def row_args
-          data = @system_arguments.fetch(:data, {}).merge(
-            params: @params.to_query,
-            context_size: @context.size
-          )
-
-          @system_arguments.merge(
-            id: "custom_work_package_#{@work_package.id}",
-            data:
-          )
-        end
-
-        def card
-          CustomWorkPackageCardListItemCard.new(subject: @work_package.subject)
-        end
-
-        def render? = false
-      end
-    )
-  end
-
-  subject(:rendered_component) do
-    render_component(work_packages:, container:, drag_and_drop:, system_arguments:)
-  end
-
-  def render_component(work_packages:, container:, drag_and_drop:, system_arguments:)
-    component_arguments = {
-      work_packages:,
-      project:,
-      container:,
-      drag_and_drop:,
-      item_component_klass:,
-      params:,
-      current_user: user,
-      **system_arguments
-    }
-    render_inline(
-      described_class.new(**component_arguments)
-    ) do |box|
-      box.with_header(**header_arguments) if header_arguments
-      box.with_empty_state(title: "Sprint 1 is empty", description: "Drag work packages here")
-      box.with_footer { footer_content } if footer_content
-    end
-  end
-
-  before do
-    stub_const(
-      "CustomWorkPackageCardListItemCard",
-      Class.new(ApplicationComponent) do
-        def initialize(subject:)
-          super()
-
-          @subject = subject
-        end
-
-        def call
-          tag.span("custom #{@subject}")
-        end
-      end
-    )
-  end
-
-  describe "Box shell" do
-    it_behaves_like "rendering Box", row_count: 1, header: false, footer: false
-    it_behaves_like "rendering Blank Slate", heading: "Sprint 1 is empty"
-  end
-
-  describe "container-derived attributes" do
-    context "when container is a Sprint" do
-      let(:container) { sprint }
-
-      it "uses dom_target(sprint) as the box id" do
-        expect(rendered_component).to have_css(".Box#sprint_#{sprint.id}")
-      end
-
-      it "uses dom_target(sprint, :list) for the collapsible BorderBox body" do
-        expect(rendered_component).to have_css("ul#sprint_#{sprint.id}_list")
-      end
-
-      it "does not emit drag-and-drop data by default" do
-        expect(rendered_component).to have_no_css(".Box[data-generic-drag-and-drop-target]")
-        expect(rendered_component).to have_no_css(".Box[data-target-id]")
-        expect(rendered_component).to have_no_css(".Box[data-target-allowed-drag-type]")
-      end
-
-      context "with drag_and_drop configured" do
-        let(:drag_and_drop) do
-          { target_id: "sprint:#{sprint.id}", allowed_drag_type: "story" }
-        end
-
-        it "uses the configured drag-and-drop data" do
-          expect(rendered_component).to have_css(".Box") do |box|
-            expect(box["data-generic-drag-and-drop-target"]).to eq("container")
-            expect(box["data-target-container-accessor"]).to eq(":scope > ul")
-            expect(box["data-target-id"]).to eq("sprint:#{sprint.id}")
-            expect(box["data-target-allowed-drag-type"]).to eq("story")
-          end
-        end
-      end
-
-      it "does not emit a default test selector" do
-        expect(rendered_component).to have_no_css(".Box[data-test-selector]")
-      end
-    end
-
-    context "when container is a BacklogBucket" do
-      let(:container) { backlog_bucket }
-
-      it "uses dom_target(backlog_bucket) as the box id" do
-        expect(rendered_component).to have_css(".Box#backlog_bucket_#{backlog_bucket.id}")
-      end
-
-      it "uses dom_target(backlog_bucket, :list) for the collapsible BorderBox body" do
-        expect(rendered_component).to have_css("ul#backlog_bucket_#{backlog_bucket.id}_list")
-      end
-
-      it "does not emit a default test selector" do
-        expect(rendered_component).to have_no_css(".Box[data-test-selector]")
-      end
-    end
-
-    context "when container is a Symbol" do
-      let(:container) { :inbox }
-
-      it "uses dom_target(container) as the box id" do
-        expect(rendered_component).to have_css(".Box#inbox")
-      end
-
-      it "uses dom_target(container, :list) for the list id" do
-        expect(rendered_component).to have_css("ul#inbox_list")
-      end
-    end
-
-    context "when container is a String" do
-      let(:container) { "custom_box" }
-
-      it "uses dom_target(container) as the box id" do
-        expect(rendered_component).to have_css(".Box#custom_box")
-      end
-
-      it "uses dom_target(container, :list) for the list id" do
-        expect(rendered_component).to have_css("ul#custom_box_list")
-      end
-    end
-
-    context "when container is a model class" do
-      let(:container) { Project }
-
-      it "uses dom_target(container) as the box id" do
-        expect(rendered_component).to have_css(".Box#project")
-      end
-
-      it "uses dom_target(container, :list) for the list id" do
-        expect(rendered_component).to have_css("ul#project_list")
-      end
-    end
-
-    context "when data[:test_selector] is provided by the caller" do
-      let(:system_arguments) { { data: { test_selector: "custom-sprint-box" } } }
-
-      it "passes the custom test selector through" do
-        expect(rendered_component).to have_css(".Box[data-test-selector='custom-sprint-box']")
-      end
-    end
-  end
-
-  describe ":header slot" do
-    context "when no header is supplied" do
-      it "renders no Box-header" do
-        expect(rendered_component).to have_no_css(".Box-header")
-      end
-    end
-
-    context "when a header is supplied" do
-      let(:header_arguments) { { title: "Sprint 1", count: 0 } }
-
-      it_behaves_like "rendering Box", row_count: 1, header: true, footer: false
-
-      it "renders the provided title" do
-        expect(rendered_component).to have_heading "Sprint 1", level: 4
-      end
-
-      it "uses dom_target(container, :header) as the header row id" do
-        expect(rendered_component).to have_css(".Box-header#sprint_#{sprint.id}_header")
-      end
-    end
-  end
-
-  describe "fold state in the rendered header" do
-    let(:header_arguments) { { title: "Sprint 1", count: 0 } }
-
-    context "when the user prefers closed folds" do
-      before do
-        user.pref[:backlogs_versions_default_fold_state] = "closed"
-      end
-
-      it "renders the header as collapsed" do
-        expect(rendered_component).to have_css ".CollapsibleHeader-triggerArea", aria: { expanded: "false" }
-      end
-    end
-
-    context "when the user prefers open folds" do
-      before do
-        user.pref[:backlogs_versions_default_fold_state] = "open"
-      end
-
-      it "renders the header as expanded" do
-        expect(rendered_component).to have_css ".CollapsibleHeader-triggerArea", aria: { expanded: "true" }
-      end
-    end
-  end
-
-  describe ":empty_state slot" do
-    it "requires the empty_state slot" do
-      expect do
-        render_inline(described_class.new(work_packages: [], project:, container: sprint, current_user: user)) do |box|
-          box.with_footer { "" }
-        end
-      end.to raise_error(ArgumentError, /empty_state slot is required when no work package items are rendered/)
-    end
-
-    it "renders the blankslate when work_packages is empty" do
-      expect(rendered_component).to have_text("Sprint 1 is empty")
-      expect(rendered_component).to have_text("Drag work packages here")
-    end
-
-    context "when there are work packages" do
-      let(:work_packages) do
-        [
-          create(:work_package, project:, type: type_feature, status: default_status,
-                                priority: default_priority, sprint:, position: 1)
-        ]
-      end
-
-      it "does not render the blankslate" do
-        expect(rendered_component).to have_no_css(".blankslate")
-      end
-    end
-  end
-
-  describe ":footer slot" do
-    let(:footer_content) { "footer-content" }
-
-    it "renders the footer row when supplied" do
-      expect(rendered_component).to have_text("footer-content")
-    end
-  end
-
-  describe "items collection" do
-    let(:work_packages) do
-      [
-        create(:work_package, subject: "WP A", project:, type: type_feature, status: default_status,
-                              priority: default_priority, sprint:, position: 1),
-        create(:work_package, subject: "WP B", project:, type: type_feature, status: default_status,
-                              priority: default_priority, sprint:, position: 2)
-      ]
-    end
-
-    it_behaves_like "rendering Box", row_count: 2, header: false, footer: false
-
-    it "renders one row per work package" do
-      expect(rendered_component).to have_text("WP A")
-      expect(rendered_component).to have_text("WP B")
-    end
-
-    it "applies the card row attributes in the rendered HTML" do
-      work_package = work_packages.first
-
-      expect(rendered_component).to have_css(
-        ".Box-row#work_package_#{work_package.id}.Box-row--clickable[data-test-selector='work-package-#{work_package.id}']"
-      )
-    end
-
-    it "does not include Backlogs row wiring by default" do
-      expect(rendered_component).to have_css(".Box-row", count: 2)
-      expect(rendered_component).to have_no_css(".Box-row[data-controller='backlogs--story']")
-      expect(rendered_component).to have_no_css(".Box-row[data-drop-url]")
-      expect(rendered_component).to have_no_css(".Box-row[data-backlogs--story-split-url-value]")
-    end
-
-    context "with an item_component_klass" do
-      let(:item_component_klass) { custom_item_component_class }
-
-      it "uses the configured item class for automatically built items" do
-        expect(rendered_component).to have_css(
-          ".Box-row#custom_work_package_#{work_packages.first.id}",
-          text: "custom WP A"
-        )
-        expect(rendered_component).to have_css(
-          ".Box-row#custom_work_package_#{work_packages.second.id}",
-          text: "custom WP B"
-        )
-      end
-    end
-  end
-
-  describe ":work_package_item slot" do
-    let(:work_packages) do
-      [
-        create(:work_package, subject: "WP A", project:, type: type_feature, status: default_status,
-                              priority: default_priority, sprint:, position: 1),
-        create(:work_package, subject: "WP B", project:, type: type_feature, status: default_status,
-                              priority: default_priority, sprint:, position: 2)
-      ]
-    end
-    let(:params) { { all: 1 } }
-    let(:slot_work_package) { work_packages.first }
-
-    def render_with_manual_item
-      render_inline(
-        described_class.new(work_packages: [], project:, container:, params:, current_user: user)
-      ) do |box|
-        box.with_empty_state(title: "empty", description: "drag here")
-        box.with_work_package_item(
-          work_package: slot_work_package,
-          component_klass: custom_item_component_class,
-          data: { source: "slot" }
-        )
-      end
-    end
-
-    it "builds rows with the configured item component class" do
-      rendered = render_with_manual_item
-
-      expect(rendered).to have_css(".Box-row#custom_work_package_#{work_packages.first.id}", text: "custom WP A")
-      expect(rendered).to have_css(".Box-row[data-source='slot']")
-      expect(rendered).to have_css(".Box-row[data-params='all=1']")
-    end
-
-    it "does not also build automatic work package rows" do
-      rendered = render_inline(
-        described_class.new(work_packages:, project:, container:, params:, current_user: user)
-      ) do |box|
-        box.with_empty_state(title: "empty", description: "drag here")
-        box.with_work_package_item(work_package: slot_work_package)
-      end
-
-      expect(rendered).to have_css(".Box-row", count: 1)
-      expect(rendered).to have_text("WP A")
-      expect(rendered).to have_no_text("WP B")
-    end
-
-    it "uses caller-provided metric content for manual work package items" do
-      rendered = render_inline(
-        described_class.new(project:, container:, params:, current_user: user)
-      ) do |box|
-        box.with_empty_state(title: "empty", description: "drag here")
-        box.with_work_package_item(work_package: slot_work_package) do |item|
-          item.with_metric { "manual metric" }
-        end
-      end
-
-      expect(rendered).to have_text("manual metric")
-    end
-
-    it "exposes build_item for building an item without adding it to the box" do
-      component = described_class.new(work_packages: [], project:, container:, params:, current_user: user)
-
-      item = component.build_item(
-        work_package: slot_work_package,
-        component_klass: custom_item_component_class,
-        data: { source: "builder" }
-      )
-
-      expect(item.row_args).to include(
-        id: "custom_work_package_#{slot_work_package.id}",
-        data: { params: "all=1", context_size: 3, source: "builder" }
-      )
-    end
-  end
-
-  describe ":empty_item slot" do
-    it "renders a caller-provided empty item row" do
-      rendered = render_inline(described_class.new(project:, container:, current_user: user)) do |box|
-        box.with_empty_item(data: { test_selector: "manual-empty-item" }) do
-          "Nothing to show"
-        end
-      end
-
-      expect(rendered).to have_css(
-        ".Box-row[data-empty-list-item='true'][data-test-selector='manual-empty-item']",
-        text: "Nothing to show"
-      )
-    end
-
-    it "raises when combined with automatic work packages" do
-      work_package = create(:work_package, project:, type: type_feature, status: default_status,
-                                           priority: default_priority, sprint:, position: 1)
-
-      expect do
-        render_inline(
-          described_class.new(work_packages: [work_package], project:, container:, current_user: user)
-        ) do |box|
-          box.with_empty_state(title: "empty", description: "drag here")
-          box.with_empty_item { "Nothing to show" }
-        end
-      end.to raise_error(ArgumentError, /empty_item cannot be combined with work_packages/)
-    end
-
-    it "raises when combined with manual work package items" do
-      work_package = create(:work_package, project:, type: type_feature, status: default_status,
-                                           priority: default_priority, sprint:, position: 1)
-
-      expect do
-        render_inline(described_class.new(project:, container:, current_user: user)) do |box|
-          box.with_empty_state(title: "empty", description: "drag here")
-          box.with_work_package_item(work_package:)
-          box.with_empty_item { "Nothing to show" }
-        end
-      end.to raise_error(ArgumentError, /empty_item cannot be combined with other items/)
-    end
-
-    it "raises when combined with generic items" do
-      expect do
-        render_inline(described_class.new(project:, container:, current_user: user)) do |box|
-          box.with_empty_state(title: "empty", description: "drag here")
-          box.with_item { "Manual item" }
-          box.with_empty_item { "Nothing to show" }
-        end
-      end.to raise_error(ArgumentError, /empty_item cannot be combined with other items/)
-    end
-  end
-
-  describe ":item slot" do
-    let(:work_packages) do
-      [
-        create(:work_package, subject: "WP A", project:, type: type_feature, status: default_status,
-                              priority: default_priority, sprint:, position: 1),
-        create(:work_package, subject: "WP B", project:, type: type_feature, status: default_status,
-                              priority: default_priority, sprint:, position: 2)
-      ]
-    end
-
-    it "renders caller-provided content with caller-provided item arguments" do
-      rendered = render_inline(described_class.new(project:, container:, current_user: user)) do |box|
-        box.with_empty_state(title: "empty", description: "drag here")
-        box.with_item(
-          id: "manual-item",
-          scheme: :neutral,
-          data: { test_selector: "manual-item" }
-        ) do
-          "Manual item"
-        end
-      end
-
-      expect(rendered).to have_css(
-        ".Box-row#manual-item[data-test-selector='manual-item']",
-        text: "Manual item"
-      )
-    end
-
-    it "can be interleaved with work package item rows" do
-      rendered = render_inline(described_class.new(project:, container:, current_user: user)) do |box|
-        box.with_empty_state(title: "empty", description: "drag here")
-        box.with_work_package_item(work_package: work_packages.first)
-        box.with_item(id: "manual-item") { "Manual item" }
-        box.with_work_package_item(work_package: work_packages.second)
-      end
-
-      expect(rendered).to have_css(".Box-row", count: 3)
-      expect(rendered).to have_css("li.Box-row:nth-child(1)", text: "WP A")
-      expect(rendered).to have_css("li.Box-row:nth-child(2)#manual-item", text: "Manual item")
-      expect(rendered).to have_css("li.Box-row:nth-child(3)", text: "WP B")
-    end
-
-    it "does not build automatic work package rows when manual rows are supplied" do
-      rendered = render_inline(
-        described_class.new(work_packages:, project:, container:, current_user: user)
-      ) do |box|
-        box.with_empty_state(title: "empty", description: "drag here")
-        box.with_item(id: "manual-item") { "Manual item" }
-      end
-
-      expect(rendered).to have_css(".Box-row", count: 1)
-      expect(rendered).to have_text("Manual item")
-      expect(rendered).to have_no_text("WP A")
-      expect(rendered).to have_no_text("WP B")
-    end
-  end
-end
diff --git a/spec/components/work_packages/bulk_delete_dialog_component_spec.rb b/spec/components/work_packages/bulk_delete_dialog_component_spec.rb
new file mode 100644
index 00000000000..a58cd7ef4ee
--- /dev/null
+++ b/spec/components/work_packages/bulk_delete_dialog_component_spec.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe WorkPackages::BulkDeleteDialogComponent, type: :component do
+  let(:user) { create(:admin) }
+
+  let(:main_project) { create(:project, name: "Main Project") }
+  let(:sub_project) { create(:project, name: "Sub Project", parent: main_project) }
+  let(:sub_sub_project) { create(:project, name: "Sub Sub Project", parent: sub_project) }
+
+  let(:wp_main) { create(:work_package, project: main_project) }
+  let(:work_packages) { [wp_main] }
+
+  subject(:component) { described_class.new(work_packages:) }
+
+  before do
+    User.current = user
+  end
+
+  describe "#projects" do
+    context "when all work packages belong to the same project and have no descendants" do
+      it "returns only that project" do
+        expect(component.send(:projects)).to eq([main_project])
+      end
+    end
+
+    context "when work packages have descendants in sub-projects" do
+      let(:child_wp) { create(:work_package, project: sub_project, parent: wp_main) }
+      let(:grandchild_wp) { create(:work_package, project: sub_sub_project, parent: child_wp) }
+
+      before do
+        grandchild_wp # ensure all records are created
+      end
+
+      it "includes projects from descendants" do
+        projects = component.send(:projects)
+
+        expect(projects).to include(main_project, sub_project, sub_sub_project)
+      end
+
+      it "reports multiple projects" do
+        expect(component.send(:multiple_projects?)).to be true
+      end
+
+      it "lists all project names" do
+        expect(component.send(:project_names)).to include("Main Project", "Sub Project", "Sub Sub Project")
+      end
+    end
+  end
+
+  describe "#description" do
+    context "when work packages have no descendants" do
+      it "returns the description without children mention" do
+        expect(component.send(:description)).to eq(
+          "The following work packages and all associated data will be permanently deleted:"
+        )
+      end
+    end
+
+    context "when work packages have descendants" do
+      let(:child_wp) { create(:work_package, project: main_project, parent: wp_main) }
+
+      before do
+        child_wp # ensure record is created
+      end
+
+      it "returns the description mentioning children" do
+        expect(component.send(:description)).to eq(
+          "The following work packages, including children and all associated data, will be permanently deleted:"
+        )
+      end
+    end
+  end
+end
diff --git a/spec/contracts/work_package_types/update_form_configuration_contract_spec.rb b/spec/contracts/work_package_types/update_form_configuration_contract_spec.rb
index 7cb17fe3882..3b62e758a3b 100644
--- a/spec/contracts/work_package_types/update_form_configuration_contract_spec.rb
+++ b/spec/contracts/work_package_types/update_form_configuration_contract_spec.rb
@@ -149,6 +149,24 @@ module WorkPackageTypes
           expect(contract.errors.details[:base]).to include(action: "Edit Attribute Groups", error: :error_enterprise_only)
         end
       end
+
+      context "when normalizing an unnamed legacy group" do
+        before do
+          model.update_column(:attribute_groups, [
+                                ["", ["assignee"]],
+                                [:details, ["priority"]]
+                              ])
+        end
+
+        it "is valid" do
+          model.attribute_groups = [
+            [I18n.t("types.edit.form_configuration.untitled_group"), ["assignee"]],
+            [:details, ["priority"]]
+          ]
+
+          expect(contract).to be_valid
+        end
+      end
     end
 
     context "with enterprise features enabled", with_ee: %i[edit_attribute_groups] do
@@ -194,6 +212,18 @@ module WorkPackageTypes
           end
         end
 
+        context "when a custom group uses the visible name of a default group" do
+          it "is invalid and adds :duplicate_group error for the visible name" do
+            model.attribute_groups = [
+              [:details, ["priority"]],
+              ["Details", ["assignee"]]
+            ]
+
+            expect(contract).not_to be_valid
+            expect(contract.errors.details[:attribute_groups]).to include(error: :duplicate_group, group: "Details")
+          end
+        end
+
         context "when an attribute group contains unknown attributes" do
           let(:invalid_group) { ["foo", ["unknown_attribute"]] }
 
@@ -219,6 +249,16 @@ module WorkPackageTypes
               .to include(hash_including(error: :query_invalid, group: "query_group"))
           end
         end
+
+        context "with a persisted embedded query owned by another user" do
+          let(:query) { create(:query, user: create(:user), name: "Existing embedded query") }
+
+          it "is valid" do
+            model.attribute_groups = [["query_group", [query]]]
+
+            expect(contract).to be_valid
+          end
+        end
       end
     end
   end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 2953024bd74..aadb1bacaee 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -736,15 +736,15 @@ RSpec.describe UsersController do
       expect(response).to have_rendered("index")
     end
 
-    it "assigns users" do
-      expect(assigns(:users)).to contain_exactly(user, admin, user_manager)
+    it "assigns a query" do
+      expect(assigns(:query).results).to contain_exactly(user, admin, user_manager)
     end
 
     context "with a name filter" do
-      let(:params) { { name: user.firstname } }
+      let(:params) { { filters: %(any_name_attribute ~ "#{user.firstname}") } }
 
-      it "assigns users" do
-        expect(assigns(:users)).to contain_exactly(user)
+      it "assigns a query filtered by name" do
+        expect(assigns(:query).results).to contain_exactly(user)
       end
     end
 
@@ -752,11 +752,11 @@ RSpec.describe UsersController do
       let(:group) { create(:group, members: [user]) }
 
       let(:params) do
-        { group_id: group.id }
+        { filters: %(group = "#{group.id}") }
       end
 
-      it "assigns users" do
-        expect(assigns(:users)).to contain_exactly(user)
+      it "assigns a query filtered by group" do
+        expect(assigns(:query).results).to contain_exactly(user)
       end
     end
 
@@ -764,7 +764,7 @@ RSpec.describe UsersController do
       let!(:deleted_user) { create(:user_marked_for_deletion) }
 
       it "does not include this user to the users list" do
-        expect(assigns(:users)).to contain_exactly(user, admin, user_manager)
+        expect(assigns(:query).results).to contain_exactly(user, admin, user_manager)
       end
     end
   end
@@ -806,14 +806,13 @@ RSpec.describe UsersController do
 
     context "enabled" do
       before do
-        allow(Setting).to receive(:session_ttl_enabled?).and_return(true)
-        allow(Setting).to receive(:session_ttl).and_return("120")
+        allow(Setting).to receive_messages(session_ttl_enabled?: true, session_ttl: "120")
         @controller.send(:logged_user=, admin)
       end
 
       context "before 120 min of inactivity" do
         before do
-          session[:updated_at] = Time.now - 1.hour
+          session[:updated_at] = 1.hour.ago
           get :index
         end
 
@@ -822,7 +821,7 @@ RSpec.describe UsersController do
 
       context "after 120 min of inactivity" do
         before do
-          session[:updated_at] = Time.now - 3.hours
+          session[:updated_at] = 3.hours.ago
           get :index
         end
 
@@ -842,7 +841,7 @@ RSpec.describe UsersController do
       context "with ttl = 0" do
         before do
           allow(Setting).to receive(:session_ttl).and_return("0")
-          session[:updated_at] = Time.now - 1.hour
+          session[:updated_at] = 1.hour.ago
           get :index
         end
 
@@ -852,7 +851,7 @@ RSpec.describe UsersController do
       context "with ttl < 0" do
         before do
           allow(Setting).to receive(:session_ttl).and_return("-60")
-          session[:updated_at] = Time.now - 1.hour
+          session[:updated_at] = 1.hour.ago
           get :index
         end
 
@@ -862,7 +861,7 @@ RSpec.describe UsersController do
       context "with ttl < 5 > 0" do
         before do
           allow(Setting).to receive(:session_ttl).and_return("4")
-          session[:updated_at] = Time.now - 1.hour
+          session[:updated_at] = 1.hour.ago
           get :index
         end
 
diff --git a/spec/controllers/work_package_types/form_configuration_groups_tab_controller_spec.rb b/spec/controllers/work_package_types/form_configuration_groups_tab_controller_spec.rb
new file mode 100644
index 00000000000..607b2c8a65a
--- /dev/null
+++ b/spec/controllers/work_package_types/form_configuration_groups_tab_controller_spec.rb
@@ -0,0 +1,219 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe WorkPackageTypes::FormConfigurationGroupsTabController do
+  let(:type) { create(:type) }
+  let(:user) { create(:admin) }
+  let(:temporary_group_key) { described_class::TEMPORARY_GROUP_KEY }
+
+  before do
+    allow(User).to receive(:current).and_return(user)
+  end
+
+  describe "POST #add_group", with_ee: %i[edit_attribute_groups] do
+    it "renders a temporary attribute group from group_type params" do
+      expect do
+        post :add_group, params: { type_id: type.id, group_type: "attribute" }, format: :turbo_stream
+      end.not_to change { type.reload.attribute_groups.count }
+
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe "POST #create", with_ee: %i[edit_attribute_groups] do
+    it "persists a group when saving it" do
+      expect do
+        post :create,
+             params: {
+               type_id: type.id,
+               group: { group_type: "attribute", name: "New Group" }
+             },
+             format: :turbo_stream
+      end.to change { type.reload.attribute_groups.count }.by(1)
+
+      expect(response).to have_http_status(:ok)
+      expect(type.reload.attribute_groups.first.key).to eq("New Group")
+    end
+
+    it "persists a query group with an empty query when saving it" do
+      query = create(:query, user:)
+      query.add_filter("parent", "=", [Queries::Filters::TemplatedValue::KEY])
+      query.save!
+      query_props = API::V3::Queries::QueryParamsRepresenter.new(query).to_json
+
+      post :create,
+           params: {
+             type_id: type.id,
+             group: { group_type: "query", name: "Empty test", query: query_props }
+           },
+           format: :turbo_stream
+
+      expect(response).to have_http_status(:ok)
+
+      query_group = type.reload.attribute_groups.detect { |group| group.is_a?(Type::QueryGroup) }
+      expect(query_group.attributes).to be_a(Query)
+      expect(query_group.key).to eq("Empty test")
+    end
+  end
+
+  describe "PATCH #update (rename)", with_ee: %i[edit_attribute_groups] do
+    before do
+      type.update_column(:attribute_groups, [
+                           ["First group", %w[priority]],
+                           ["Second group", %w[assignee]]
+                         ])
+    end
+
+    context "when renaming to a duplicate name" do
+      it "returns an error without the attribute prefix" do
+        patch :update,
+              params: {
+                type_id: type.id,
+                key: "First group",
+                group: { name: "Second group" }
+              },
+              format: :turbo_stream
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.body).to include("Second group")
+        expect(response.body).to include("Group names must be unique.")
+        expect(response.body).not_to include("Form configuration")
+      end
+
+      it "preserves the entered name in the input field" do
+        patch :update,
+              params: {
+                type_id: type.id,
+                key: "First group",
+                group: { name: "Second group" }
+              },
+              format: :turbo_stream
+
+        expect(response.body).to include("Second group")
+      end
+    end
+
+    context "when renaming to a blank name" do
+      it "returns an error" do
+        patch :update,
+              params: {
+                type_id: type.id,
+                key: "First group",
+                group: { name: "" }
+              },
+              format: :turbo_stream
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
+  describe "POST #create (duplicate name)", with_ee: %i[edit_attribute_groups] do
+    before do
+      type.update_column(:attribute_groups, [["Existing group", %w[priority]]])
+    end
+
+    it "returns an error when creating a group with a duplicate name" do
+      post :create,
+           params: {
+             type_id: type.id,
+             group: { group_type: "attribute", name: "Existing group" }
+           },
+           format: :turbo_stream
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(response.body).to include('action="update"')
+      expect(response.body).to include('target="work-package-types-form-configuration-main-content-component"')
+      expect(response.body).not_to include("Form configuration")
+    end
+
+    it "returns a main content turbo stream response" do
+      post :create,
+           params: {
+             type_id: type.id,
+             group: { group_type: "attribute", name: "Existing group" }
+           },
+           format: :turbo_stream
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(response.body).to include('target="work-package-types-form-configuration-main-content-component"')
+    end
+
+    it "does not render the existing group twice when a query group create fails" do
+      query = create(:query, user:)
+      query_props = API::V3::Queries::QueryParamsRepresenter.new(query).to_json
+
+      post :create,
+           params: {
+             type_id: type.id,
+             group: { group_type: "query", name: "Existing group", query: query_props }
+           },
+           format: :turbo_stream
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(response.body.scan('data-group-key="Existing group"').count).to eq(1)
+      expect(response.body).to include('data-group-key="__new_form_configuration_group__"')
+    end
+  end
+
+  describe "POST #create (default group name)", with_ee: %i[edit_attribute_groups] do
+    it "returns an error when creating a group with the visible name of a default group" do
+      post :create,
+           params: {
+             type_id: type.id,
+             group: { group_type: "attribute", name: "Details" }
+           },
+           format: :turbo_stream
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(response.body).to include("Details")
+      expect(response.body).to include("Group names must be unique.")
+    end
+  end
+
+  describe "PUT #drop", with_ee: %i[edit_attribute_groups] do
+    it "reorders groups using the requested position" do
+      type.update_column(:attribute_groups, [
+                           [:details, %w[priority]],
+                           ["Custom group", %w[version]],
+                           [:people, %w[assignee]]
+                         ])
+
+      put :drop,
+          params: { type_id: type.id, key: "Custom group", position: 1 },
+          format: :turbo_stream
+
+      expect(response).to have_http_status(:ok)
+      expect(type.reload.attribute_groups.map(&:key)).to eq(["Custom group", :details, :people])
+    end
+  end
+end
diff --git a/spec/controllers/work_package_types/form_configuration_tab_controller_rows_spec.rb b/spec/controllers/work_package_types/form_configuration_tab_controller_rows_spec.rb
new file mode 100644
index 00000000000..50f12285fa0
--- /dev/null
+++ b/spec/controllers/work_package_types/form_configuration_tab_controller_rows_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe WorkPackageTypes::FormConfigurationTabController do
+  let(:type) { create(:type) }
+  let(:user) { create(:admin) }
+
+  before do
+    allow(User).to receive(:current).and_return(user)
+    type.update_column(:attribute_groups, [[:details, %w[priority version]]])
+  end
+
+  describe "PUT #drop", with_ee: %i[edit_attribute_groups] do
+    it "uses the row_key param and moves the row to inactive" do
+      put :drop,
+          params: { type_id: type.id, row_key: "priority", target_id: "inactive", position: 1 },
+          format: :turbo_stream
+
+      expect(response).to have_http_status(:ok)
+      expect(type.reload.attribute_groups.flat_map(&:members)).not_to include("priority")
+    end
+
+    it "moves the row into another active section at the requested position" do
+      type.update_column(:attribute_groups, [
+                           [:details, %w[priority]],
+                           ["Custom group", %w[version]]
+                         ])
+
+      put :drop,
+          params: { type_id: type.id, row_key: "priority", target_id: "Custom group", position: 1 },
+          format: :turbo_stream
+
+      expect(response).to have_http_status(:ok)
+
+      target_group = type.reload.attribute_groups.find { |group| group.key == "Custom group" }
+      expect(target_group.members).to eq(%w[priority version])
+    end
+  end
+end
diff --git a/spec/controllers/work_package_types/form_configuration_tab_controller_spec.rb b/spec/controllers/work_package_types/form_configuration_tab_controller_spec.rb
index 04573672a96..a3781834498 100644
--- a/spec/controllers/work_package_types/form_configuration_tab_controller_spec.rb
+++ b/spec/controllers/work_package_types/form_configuration_tab_controller_spec.rb
@@ -133,6 +133,24 @@ RSpec.describe WorkPackageTypes::FormConfigurationTabController do
           expect(response).to render_template(:edit)
         end
       end
+
+      context "with malformed attribute group JSON" do
+        let(:params) do
+          {
+            type_id: type.id,
+            type: {
+              attribute_groups: "{"
+            }
+          }
+        end
+
+        it "renders the edit tab instead of raising" do
+          put :update, params: params
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response).to render_template(:edit)
+        end
+      end
     end
   end
 end
diff --git a/spec/features/security/session_ttl_spec.rb b/spec/features/security/session_ttl_spec.rb
index a92418be02a..de4d2afbc38 100644
--- a/spec/features/security/session_ttl_spec.rb
+++ b/spec/features/security/session_ttl_spec.rb
@@ -63,7 +63,6 @@ RSpec.describe "Session TTL",
 
   describe "outdated TTL on API request" do
     it "expires on the next APIv3 request" do
-      page.driver.header("X-Requested-With", "XMLHttpRequest")
       visit "/api/v3/work_packages/#{work_package.id}"
 
       body = JSON.parse(page.body)
diff --git a/spec/features/types/form_configuration_query_spec.rb b/spec/features/types/form_configuration_query_spec.rb
index f0cab72062d..fc43620ce01 100644
--- a/spec/features/types/form_configuration_query_spec.rb
+++ b/spec/features/types/form_configuration_query_spec.rb
@@ -93,21 +93,21 @@ RSpec.describe "form query configuration", :js do
     end
 
     it "can save an empty query group" do
-      form.add_query_group("Empty test", :children)
-      form.save_changes
-      expect_and_dismiss_flash(message: "Successful update.")
-      type_bug.reload
+      form.add_query_group("Empty test", :children, expect: false)
+      form.expect_group("Empty test", "Empty test")
+    end
 
-      query_group = type_bug.attribute_groups.detect { |x| x.is_a?(Type::QueryGroup) }
-      expect(query_group.attributes).to be_a(Query)
-      expect(query_group.key).to eq("Empty test")
+    it "can edit a query group by clicking the Work packages table link" do
+      form.add_query_group("Link test", :children, expect: false)
+      form.expect_group("Link test", "Link test")
+
+      form.edit_query_group_via_link("Link test")
+      modal.expect_open
+      modal.cancel
     end
 
     it "loads the children from the table split view (Regression #28490)" do
       form.add_query_group("Subtasks", :children)
-      # Save changed query
-      form.save_changes
-      expect_and_dismiss_flash(message: "Successful update.")
 
       # Visit wp_table
       wp_table.visit!
@@ -131,9 +131,6 @@ RSpec.describe "form query configuration", :js do
 
       it "does not show a subgroup (Regression #29582)" do
         form.add_query_group("Subtasks", :children)
-        # Save changed query
-        form.save_changes
-        expect_and_dismiss_flash(message: "Successful update.")
 
         # Visit new wp page
         visit new_project_work_packages_path(project)
@@ -153,11 +150,9 @@ RSpec.describe "form query configuration", :js do
           filters.expect_filter_count 1
           filters.add_filter_by("Project", "is (OR)", archived.name)
           filters.expect_filter_count 2
+          filters.save
         end
 
-        form.save_changes
-        expect_and_dismiss_flash(message: "Successful update.")
-
         archived.update_attribute(:active, false)
 
         visit edit_type_form_configuration_path(type_bug)
@@ -178,12 +173,9 @@ RSpec.describe "form query configuration", :js do
         columns.uncheck_all save_changes: false
         columns.add "ID", save_changes: false
         columns.add "Subject", save_changes: false
+        columns.apply
       end
 
-      # Save changed query
-      form.save_changes
-      expect_and_dismiss_flash(message: "Successful update.")
-
       type_bug.reload
       query = type_bug.attribute_groups.detect { |x| x.key == "Columns Test" }
       expect(query).to be_present
@@ -198,12 +190,9 @@ RSpec.describe "form query configuration", :js do
         columns.assume_opened
         columns.uncheck_all save_changes: false
         columns.add "ID", save_changes: false
+        columns.apply
       end
 
-      # Save changed query
-      form.save_changes
-      expect_and_dismiss_flash(message: "Successful update.")
-
       type_bug.reload
       query = type_bug.attribute_groups.detect { |x| x.key == "Columns Test" }
       expect(query).to be_present
@@ -245,11 +234,9 @@ RSpec.describe "form query configuration", :js do
           # the templated filter should be hidden in the Filters tab
           filters.expect_filter_count 1
           filters.add_filter_by("Type", "is (OR)", type_task.name)
+          filters.save
         end
 
-        form.save_changes
-        expect_and_dismiss_flash(message: "Successful update.")
-
         # Visit work package with that type
         wp_page.visit!
         wp_page.ensure_page_loaded
@@ -293,9 +280,6 @@ RSpec.describe "form query configuration", :js do
         filters.remove_filter "type"
         filters.save
 
-        # Save changes
-        form.save_changes
-
         # Visit wp_page again, expect both listed
         wp_page.visit!
         wp_page.ensure_page_loaded
diff --git a/spec/features/types/form_configuration_spec.rb b/spec/features/types/form_configuration_spec.rb
index 53e64688c1b..749fa00768f 100644
--- a/spec/features/types/form_configuration_spec.rb
+++ b/spec/features/types/form_configuration_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe "form configuration", :js, :selenium do
   let(:wp_page) { Pages::FullWorkPackage.new(work_package) }
   let(:form) { Components::Admin::TypeConfigurationForm.new }
 
-  describe "with EE token", with_ee: %i[edit_attribute_groups] do
+  describe "query group actions with EE token", with_ee: %i[edit_attribute_groups] do
     describe "default configuration" do
       let(:dialog) { Components::ConfirmationDialog.new }
 
@@ -56,31 +56,38 @@ RSpec.describe "form configuration", :js, :selenium do
         visit edit_type_form_configuration_path(type)
       end
 
+      def persisted_group_order(type)
+        type.reload.attribute_groups.reject { |group| group.key == :__empty }.map(&:translated_key)
+      end
+
+      def persisted_attribute_order(type, group_key)
+        type.reload.attribute_groups.find { |group| group.key.to_s == group_key.to_s }&.attributes
+      end
+
       it "resets the form properly after changes" do
         form.rename_group("Details", "Whatever")
         form.expect_attribute(key: :assignee)
 
         # Reset and cancel
         form.reset_button.click
-        dialog.expect_open
-        dialog.cancel
+        dialog = find_test_selector("type-form-configuration-reset-dialog", visible: :all)
+        within(dialog) do
+          click_button I18n.t("js.button_cancel")
+        end
 
-        expect(page).to have_css(".group-edit-handler", text: "WHATEVER")
+        form.expect_group("Whatever", "Whatever")
 
-        # Click the dialog again after some time
-        # Otherwise this may cause issues due to the animation,
-        # which is why sleep is okay.
-        sleep 1
+        # Wait for dialog close animation to finish before opening it again
+        expect(page).to have_no_css("dialog[open]")
 
         # Reset and confirm
         form.reset_button.click
-        dialog.expect_open
-        dialog.confirm
+        dialog = find_test_selector("type-form-configuration-reset-dialog", visible: :all)
+        within(dialog) do
+          click_button I18n.t("button_reset")
+        end
 
-        # Wait for page reload
-        sleep 1
-
-        expect(page).to have_no_css(".group-head", text: "WHATEVER")
+        expect(page).to have_no_css("[data-group-key]", text: /\bWhatever\b/)
         form.expect_group("details", "Details")
         form.expect_attribute(key: :assignee)
       end
@@ -92,10 +99,6 @@ RSpec.describe "form configuration", :js, :selenium do
         form.remove_group "Costs"
         form.remove_group "Other"
 
-        # Save configuration
-        form.save_changes
-        expect_flash(message: "Successful update.")
-
         form.expect_empty
 
         # Test the actual type backend
@@ -158,12 +161,14 @@ RSpec.describe "form configuration", :js, :selenium do
         form.rename_group("People", "Cool Stuff")
 
         # Start renaming, but cancel
-        find(".group-edit-handler", text: "COOL STUFF").click
-        input = find(".group-edit-in-place--input")
+        group_key = form.send(:find_group, "Cool Stuff")["data-group-key"]
+        form.send(:open_group_menu, "Cool Stuff")
+        page.find_test_selector("type-form-configuration-group-rename-#{group_key}", visible: :all).click
+        input = find_test_selector("type-form-configuration-group-name-input", wait: 10)
         input.set("FOOBAR")
-        input.send_keys(:escape)
-        expect(page).to have_css(".group-edit-handler", text: "COOL STUFF")
-        expect(page).to have_no_css(".group-edit-handler", text: "FOOBAR")
+        page.find_test_selector("type-form-configuration-group-cancel", wait: 10).click
+        form.expect_group("Cool Stuff", "Cool Stuff")
+        expect(page).to have_no_css("[data-group-key]", text: /\bFOOBAR\b/)
 
         # Create new group
         form.add_attribute_group("New Group")
@@ -172,10 +177,6 @@ RSpec.describe "form configuration", :js, :selenium do
         # Delete attribute from group
         form.remove_attribute("assignee")
 
-        # Save configuration
-        form.save_changes
-        expect_flash(message: "Successful update.")
-
         # Expect configuration to be correct now
         form.expect_no_attribute("assignee", "Cool Stuff")
 
@@ -203,7 +204,9 @@ RSpec.describe "form configuration", :js, :selenium do
         # Test the actual type backend
         type.reload
         expect(type.attribute_groups.map(&:key))
-          .to include("Cool Stuff", :estimates_and_progress, "Whatever", "New Group")
+          .to include(:people, :estimates_and_progress, :details, "New Group")
+        expect(type.attribute_groups.detect { |g| g.key == :people }&.display_name).to eq("Cool Stuff")
+        expect(type.attribute_groups.detect { |g| g.key == :details }&.display_name).to eq("Whatever")
 
         # Visit work package with that type
         wp_page.visit!
@@ -246,6 +249,192 @@ RSpec.describe "form configuration", :js, :selenium do
         expect(wp_page).not_to have_alert_dialog
         loading_indicator_saveguard
       end
+
+      it "removes a newly added unsaved custom group when canceling edit" do
+        initial_order = form.group_order
+
+        form.add_button_dropdown.click
+        click_on I18n.t("types.edit.form_configuration.add_attribute_group")
+
+        expect(page.find_test_selector("type-form-configuration-group-name-input", wait: 10).value).to eq("")
+
+        page.find_test_selector("type-form-configuration-group-cancel", wait: 10).click
+
+        expect(form.group_order).to eq(initial_order)
+      end
+
+      it "keeps a saved custom group when canceling rename" do
+        form.add_attribute_group("Saved custom group")
+
+        visit edit_type_form_configuration_path(type)
+
+        group_key = form.send(:find_group, "Saved custom group")["data-group-key"]
+        form.send(:open_group_menu, "Saved custom group")
+        page.find_test_selector("type-form-configuration-group-rename-#{group_key}", visible: :all).click
+
+        input = page.find_test_selector("type-form-configuration-group-name-input", wait: 10)
+        expect(input.value).to eq("Saved custom group")
+
+        input.set("Renamed group")
+        page.find_test_selector("type-form-configuration-group-cancel", wait: 10).click
+
+        form.expect_group("Saved custom group", "Saved custom group")
+        expect(page).to have_no_css("[data-group-key]", text: /\bRenamed group\b/)
+      end
+
+      it "shows only the edit action for query rows" do
+        form.add_query_group("Subtasks", :children)
+
+        menu_id = form.open_query_menu("Subtasks")
+        menu_selector = "##{menu_id}"
+
+        expect(page).to have_selector(menu_selector, text: I18n.t("types.edit.form_configuration.edit_query"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_to_top"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_up"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_down"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_to_bottom"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("button_delete"))
+      end
+
+      it "shows only delete for a single attribute row" do
+        form.add_attribute_group("New Group")
+        form.move_to(:category, "New Group")
+
+        menu_id = form.open_attribute_menu(:category)
+        menu_selector = "##{menu_id}"
+
+        expect(page).to have_selector(menu_selector, text: I18n.t("button_delete"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_to_top"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_up"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_down"))
+        expect(page).to have_no_selector("#{menu_selector} [role='menuitem']", text: I18n.t("label_agenda_item_move_to_bottom"))
+      end
+
+      it "shows move actions only where valid for multi-row groups" do
+        details_order = form.attribute_order("Details")
+
+        first_row_menu_id = form.open_attribute_menu(details_order.first)
+
+        within "##{first_row_menu_id}" do
+          expect(page).to have_text(I18n.t("label_agenda_item_move_down"))
+          expect(page).to have_text(I18n.t("label_agenda_item_move_to_bottom"))
+          expect(page).to have_no_text(I18n.t("label_agenda_item_move_to_top"))
+          expect(page).to have_no_text(I18n.t("label_agenda_item_move_up"))
+          expect(page).to have_text(I18n.t("button_delete"))
+        end
+
+        find("body").click
+
+        last_row_menu_id = form.open_attribute_menu(details_order.last)
+
+        within "##{last_row_menu_id}" do
+          expect(page).to have_text(I18n.t("label_agenda_item_move_to_top"))
+          expect(page).to have_text(I18n.t("label_agenda_item_move_up"))
+          expect(page).to have_no_text(I18n.t("label_agenda_item_move_down"))
+          expect(page).to have_no_text(I18n.t("label_agenda_item_move_to_bottom"))
+          expect(page).to have_text(I18n.t("button_delete"))
+        end
+      end
+
+      it "opens the query editor from the query row action" do
+        form.add_query_group("Subtasks", :children)
+
+        menu_id = form.open_query_menu("Subtasks")
+
+        within "##{menu_id}" do
+          click_button I18n.t("types.edit.form_configuration.edit_query")
+        end
+
+        expect(page).to have_css(".wp-table--configuration-modal")
+      end
+
+      it "reorders and deletes groups via group actions" do
+        expected_order = persisted_group_order(type)
+        moving_group = expected_order.second
+        initial_updated_at = type.updated_at
+
+        form.invoke_group_action(moving_group, I18n.t("label_agenda_item_move_up"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        index = expected_order.index(moving_group)
+        expected_order[index], expected_order[index - 1] = expected_order[index - 1], expected_order[index]
+        expect(persisted_group_order(type)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_group_action(moving_group, I18n.t("label_agenda_item_move_to_bottom"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        expected_order.delete(moving_group)
+        expected_order << moving_group
+        expect(persisted_group_order(type)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_group_action(moving_group, I18n.t("label_agenda_item_move_up"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        index = expected_order.index(moving_group)
+        expected_order[index], expected_order[index - 1] = expected_order[index - 1], expected_order[index]
+        expect(persisted_group_order(type)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_group_action(moving_group, I18n.t("label_agenda_item_move_to_top"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        expected_order.delete(moving_group)
+        expected_order.unshift(moving_group)
+        expect(persisted_group_order(type)).to eq(expected_order)
+
+        deleted_group = expected_order.last
+        initial_updated_at = type.updated_at
+        accept_confirm I18n.t("types.edit.form_configuration.confirm_delete_group") do
+          form.invoke_group_action(deleted_group, I18n.t("button_delete"))
+        end
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        expected_order.delete(deleted_group)
+        expect(persisted_group_order(type)).to eq(expected_order)
+      end
+
+      it "reorders and deletes attribute rows via row actions" do
+        expected_order = persisted_attribute_order(type, :details)
+        moving_attribute = expected_order.second
+        initial_updated_at = type.updated_at
+
+        form.invoke_attribute_action(moving_attribute, I18n.t("label_agenda_item_move_up"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        index = expected_order.index(moving_attribute)
+        expected_order[index], expected_order[index - 1] = expected_order[index - 1], expected_order[index]
+        expect(persisted_attribute_order(type, :details)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_attribute_action(moving_attribute, I18n.t("label_agenda_item_move_down"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        index = expected_order.index(moving_attribute)
+        expected_order[index], expected_order[index + 1] = expected_order[index + 1], expected_order[index]
+        expect(persisted_attribute_order(type, :details)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_attribute_action(moving_attribute, I18n.t("label_agenda_item_move_to_bottom"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        expected_order.delete(moving_attribute)
+        expected_order << moving_attribute
+        expect(persisted_attribute_order(type, :details)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_attribute_action(moving_attribute, I18n.t("label_agenda_item_move_up"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        index = expected_order.index(moving_attribute)
+        expected_order[index], expected_order[index - 1] = expected_order[index - 1], expected_order[index]
+        expect(persisted_attribute_order(type, :details)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_attribute_action(moving_attribute, I18n.t("label_agenda_item_move_to_top"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        expected_order.delete(moving_attribute)
+        expected_order.unshift(moving_attribute)
+        expect(persisted_attribute_order(type, :details)).to eq(expected_order)
+
+        initial_updated_at = type.updated_at
+        form.invoke_attribute_action(moving_attribute, I18n.t("button_delete"))
+        wait_for { type.reload.updated_at }.not_to eq(initial_updated_at)
+        expected_order.delete(moving_attribute)
+        expect(persisted_attribute_order(type, :details)).to eq(expected_order)
+      end
     end
 
     describe "required custom field" do
@@ -265,14 +454,12 @@ RSpec.describe "form configuration", :js, :selenium do
       it "shows the field" do
         # Should be initially disabled
         form.expect_inactive(cf_identifier)
+        form.expect_attribute(key: cf_identifier, translation: "MyNumber")
 
         # Add into new group
         form.add_attribute_group("New Group")
         form.move_to(cf_identifier, "New Group")
-        form.expect_attribute(key: cf_identifier)
-
-        form.save_changes
-        expect_flash(message: "Successful update.")
+        form.expect_attribute(key: cf_identifier, translation: "MyNumber")
       end
     end
 
@@ -300,9 +487,6 @@ RSpec.describe "form configuration", :js, :selenium do
 
         # Make visible
         form.expect_attribute(key: cf_identifier)
-
-        form.save_changes
-        expect_flash(message: "Successful update.")
       end
 
       context "if inactive in project" do
@@ -322,7 +506,7 @@ RSpec.describe "form configuration", :js, :selenium do
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: "MyNumber")
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: type.name)
 
-          id_checkbox = find("#project_work_package_custom_field_ids_#{custom_field.id}")
+          id_checkbox = find("input[name='project[work_package_custom_field_ids][]'][value='#{custom_field.id}']")
           expect(id_checkbox).not_to be_checked
           id_checkbox.set(true)
 
@@ -362,32 +546,58 @@ RSpec.describe "form configuration", :js, :selenium do
           project_cf_settings_page.visit!
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: "MyNumber")
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: type.name)
-          expect(page).to have_css("#project_work_package_custom_field_ids_#{custom_field.id}[checked]")
+          expect(page).to have_css("input[name='project[work_package_custom_field_ids][]'][value='#{custom_field.id}'][checked]")
         end
       end
     end
   end
 
   describe "without EE token", with_ee: false do
-    let(:dialog) { Components::ConfirmationDialog.new }
-
-    it "must disable adding and renaming groups" do
+    it "hides protected group actions" do
       login_as(admin)
       visit edit_type_form_configuration_path(type)
 
-      find(".group-edit-handler", text: "DETAILS").click
-      dialog.expect_open
+      expect(page).to have_no_test_selector("type-form-configuration-add-button")
+
+      menu_id = form.send(:open_group_menu, "Details")
+      within "##{menu_id}" do
+        expect(page).to have_no_text(I18n.t("types.edit.form_configuration.rename_group"))
+        expect(page).to have_no_text(I18n.t("button_delete"))
+      end
+    end
+
+    it "hides protected query group actions" do
+      query = build(:global_query, user_id: 0)
+      type.attribute_groups = [["Subtasks", [query]]]
+      type.save!
+
+      login_as(admin)
+      visit edit_type_form_configuration_path(type)
+
+      expect(page).to have_no_test_selector("type-form-configuration-query-actions-Subtasks")
+    end
+  end
+
+  describe "with EE token", with_ee: %i[edit_attribute_groups] do
+    it "shows protected group actions" do
+      login_as(admin)
+      visit edit_type_form_configuration_path(type)
+
+      menu_id = form.send(:open_group_menu, "Details")
+      within "##{menu_id}" do
+        expect(page).to have_text(I18n.t("types.edit.form_configuration.rename_group"))
+        expect(page).to have_text(I18n.t("button_delete"))
+      end
     end
   end
 
   describe "form submission", :js, with_ee: %i[edit_attribute_groups] do
-    # Regression test for double form submission happening on the form configuration page
-    it "only submits the form once (Regression#70297)" do
+    it "only creates one group per add action" do
       call_count = 0
       subscription =
         ActiveSupport::Notifications.subscribe("process_action.action_controller") do |*, payload|
           payload => { controller:, action: }
-          if controller == "WorkPackageTypes::FormConfigurationTabController" && action == "update"
+          if controller == "WorkPackageTypes::FormConfigurationGroupsTabController" && action == "create"
             call_count += 1
           end
         end
@@ -395,24 +605,11 @@ RSpec.describe "form configuration", :js, :selenium do
       login_as(admin)
       visit edit_type_form_configuration_path(type)
 
-      # Wait for form to load
       form.expect_group("details", "Details")
-
-      # Simulate native mousedown -> mouseup -> click sequence
-      # Including some sleep time to simulate the user actually
-      # holding the mouse button for > 50ms then releasing it.
-      save_button = find(".form-configuration--save")
-
-      save_button.execute_script("this.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))")
-      sleep 0.1
-      save_button.execute_script("this.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }))")
-      sleep 0.1
-      save_button.execute_script("this.dispatchEvent(new MouseEvent('click', { bubbles: true }))")
-
-      expect_flash(message: "Successful update.")
+      form.add_attribute_group("New Group")
 
       ActiveSupport::Notifications.unsubscribe(subscription)
-      expect(call_count).to eq(1), "Expected 1 form submission but got #{call_count}"
+      expect(call_count).to eq(1), "Expected 1 group creation but got #{call_count}"
     end
   end
 end
diff --git a/spec/features/types/reset_form_configuration_spec.rb b/spec/features/types/reset_form_configuration_spec.rb
index 622f1e72e61..0c27e46daa4 100644
--- a/spec/features/types/reset_form_configuration_spec.rb
+++ b/spec/features/types/reset_form_configuration_spec.rb
@@ -38,7 +38,6 @@ RSpec.describe "Reset form configuration",
 
   let(:project) { create(:project, types: [type]) }
   let(:form) { Components::Admin::TypeConfigurationForm.new }
-  let(:dialog) { Components::ConfirmationDialog.new }
 
   describe "with EE token and CFs", with_ee: %i[edit_attribute_groups] do
     let(:custom_fields) { [custom_field] }
@@ -63,20 +62,34 @@ RSpec.describe "Reset form configuration",
       form.move_to(cf_identifier, "New Group")
       form.expect_attribute(key: cf_identifier)
 
-      form.save_changes
-      expect_flash(message: "Successful update.")
-
       SeleniumHubWaiter.wait
       form.reset_button.click
-      dialog.expect_open
-      dialog.confirm
+      expect(page).to have_test_selector("type-form-configuration-reset-dialog")
+      page.within_test_selector "type-form-configuration-reset-dialog" do
+        click_button I18n.t("button_reset")
+      end
 
-      # Wait for page reload
-      SeleniumHubWaiter.wait
+      wait_for do
+        type.reload.attribute_groups.reject { |group| group.key == :__empty }.map(&:translated_key)
+      end.to eq([
+                  "People",
+                  "Estimates and progress",
+                  "Details",
+                  "Other",
+                  "Costs"
+                ])
 
-      expect(page).to have_no_css(".group-head", text: "NEW GROUP")
-      expect(page).to have_css(".group-head", text: "OTHER")
-      type.reload
+      visit edit_type_form_configuration_path(type)
+
+      expect(form.group_order).to eq(
+        [
+          "People",
+          "Estimates and progress",
+          "Details",
+          "Other",
+          "Costs"
+        ]
+      )
 
       expect(type.custom_field_ids).to be_empty
 
diff --git a/spec/features/users/index_spec.rb b/spec/features/users/index_spec.rb
index 2841c514245..28b4ea9285d 100644
--- a/spec/features/users/index_spec.rb
+++ b/spec/features/users/index_spec.rb
@@ -39,6 +39,31 @@ RSpec.describe "index users", :js do
     login_as current_user
   end
 
+  describe "filtering", :js do
+    let!(:alice) { create(:user, login: "alice", firstname: "Alice", lastname: "Smith") }
+    let!(:bob)   { create(:user, login: "bob",   firstname: "Bob",   lastname: "Jones") }
+
+    it "filters by name via the search input and updates without a page reload" do
+      index_page.visit!
+      index_page.expect_listed(current_user, alice, bob)
+
+      index_page.filter_by_name("Alice")
+      index_page.expect_listed(alice)
+    end
+
+    it "allows changing the status filter away from the default active-only view" do
+      registered = create(:user, login: "charlie", status: User.statuses[:registered])
+
+      index_page.visit!
+      # Default: only active users
+      index_page.expect_listed(current_user, alice, bob)
+      expect(page).to have_no_css("td.username a", text: registered.login)
+
+      index_page.filter_by_status(I18n.t(:status_registered))
+      index_page.expect_listed(registered)
+    end
+  end
+
   describe "with some sortable users" do
     let!(:a_user) { create(:user, login: "aa_login", firstname: "aa_first", lastname: "xxx_a") }
     let!(:b_user) { create(:user, login: "bb_login", firstname: "bb_first", lastname: "nnn_b") }
@@ -68,94 +93,78 @@ RSpec.describe "index users", :js do
     shared_let(:registered_user) { create(:user, status: User.statuses[:registered]) }
     shared_let(:invited_user) { create(:user, status: User.statuses[:invited]) }
 
-    it "shows the users by status and allows status manipulations",
+    it "shows active users by default and allows status filtering and manipulations",
        with_settings: { brute_force_block_after_failed_logins: 5,
                         brute_force_block_minutes: 10 } do
       index_page.visit!
 
-      # Order is by id, asc
-      # so first ones created are on top.
-      index_page.expect_listed(current_user, active_user, registered_user, invited_user)
-
-      index_page.order_by("Created on")
-      index_page.expect_order(invited_user, registered_user, active_user, current_user)
-
-      index_page.order_by("Created on")
-      index_page.expect_order(current_user, active_user, registered_user, invited_user)
+      # Default filter: active users only
+      index_page.expect_listed(current_user, active_user)
 
       index_page.lock_user(active_user)
-      index_page.expect_listed(current_user, active_user, registered_user, invited_user)
+      expect(active_user.reload).to be_locked
+
+      index_page.filter_by_status(I18n.t(:status_locked))
+      index_page.expect_listed(active_user)
       index_page.expect_user_locked(active_user)
 
-      expect(active_user.reload)
-        .to be_locked
-
-      index_page.filter_by_status("locked permanently")
-      index_page.expect_listed(active_user)
-
-      index_page.filter_by_status("active")
+      index_page.filter_by_status(I18n.t(:status_active))
       index_page.expect_listed(current_user)
 
-      index_page.filter_by_status("locked permanently")
+      index_page.filter_by_status(I18n.t(:status_locked))
       index_page.unlock_user(active_user)
       index_page.expect_non_listed
 
-      index_page.filter_by_status("active")
+      index_page.filter_by_status(I18n.t(:status_active))
       index_page.expect_listed(current_user, active_user)
 
       index_page.filter_by_name(active_user.lastname[0..-3])
       index_page.expect_listed(active_user)
 
-      # temporarily block user
+      # temporarily block user — reset via action, no filter needed
       active_user.update(failed_login_count: 6,
                          last_failed_login_on: 9.minutes.ago)
       index_page.clear_filters
-      index_page.expect_listed(current_user, active_user, registered_user, invited_user)
-
-      index_page.filter_by_status("locked temporarily")
-      index_page.expect_listed(active_user)
+      # after clear, default active filter is restored
+      index_page.expect_listed(current_user, active_user)
 
       index_page.reset_failed_logins(active_user)
-      index_page.expect_non_listed
-
-      # temporarily block user and lock permanently
-      active_user.reload
-      active_user.update(failed_login_count: 6,
-                         last_failed_login_on: 9.minutes.ago)
-      index_page.clear_filters
-
-      index_page.filter_by_status("locked temporarily")
-      index_page.expect_listed(active_user)
+      # still listed — reset doesn't change status
+      index_page.expect_listed(current_user, active_user)
 
+      # Lock and unlock — failed logins were reset above, so the user is locked
+      # but not blocked, and the row exposes the plain "Unlock" action.
       index_page.lock_user(active_user)
+      index_page.filter_by_status(I18n.t(:status_locked))
       index_page.expect_listed(active_user)
 
-      index_page.filter_by_status("locked permanently")
-      index_page.expect_listed(active_user)
-
-      index_page.unlock_and_reset_user(active_user)
+      index_page.unlock_user(active_user)
       index_page.expect_non_listed
 
-      index_page.filter_by_status("active")
+      index_page.filter_by_status(I18n.t(:status_active))
       index_page.expect_listed(current_user, active_user)
 
       # activate registered user
-      index_page.filter_by_status("registered")
+      index_page.filter_by_status(I18n.t(:status_registered))
       index_page.expect_listed(registered_user)
 
       index_page.activate_user(registered_user)
-      index_page.filter_by_status("active")
-
+      index_page.filter_by_status(I18n.t(:status_active))
       index_page.expect_listed(current_user, active_user, registered_user)
     end
 
     context "as global user" do
-      shared_let(:global_manage_user) { create(:user, global_permissions: [:manage_user]) }
+      # :manage_user declares :view_all_principals as a dependency in the
+      # access-control map; the factory does not auto-expand dependencies, so we
+      # add it explicitly to match real-world role configuration.
+      shared_let(:global_manage_user) do
+        create(:user, global_permissions: %i[manage_user view_all_principals])
+      end
       let(:current_user) { global_manage_user }
 
       it "can too visit the page" do
         index_page.visit!
-        index_page.expect_listed(admin, current_user, active_user, registered_user, invited_user)
+        index_page.expect_listed(admin, current_user, active_user)
       end
     end
   end
diff --git a/spec/features/users/unaccent_user_filter_spec.rb b/spec/features/users/unaccent_user_filter_spec.rb
index bd86f6e6b41..bf616807874 100644
--- a/spec/features/users/unaccent_user_filter_spec.rb
+++ b/spec/features/users/unaccent_user_filter_spec.rb
@@ -51,14 +51,12 @@ RSpec.describe "Finding users with accents", :js do
   it "finds a user with accents in the name in the global administration" do
     visit users_path
 
-    fill_in "name", with: "Cecile"
-    click_on "Apply"
-    expect(page).to have_current_path /name=Cecile/
+    fill_in "Search", with: "Cecile"
+    wait_for_network_idle
     expect(page).to have_css("td.firstname", text: "Cécile")
 
-    fill_in "name", with: "Cécile"
-    click_on "Apply"
-    expect(page).to have_current_path /name=C%C3%A9cile/
+    fill_in "Search", with: "Cécile"
+    wait_for_network_idle
     expect(page).to have_css("td.firstname", text: "Cécile")
   end
 
diff --git a/spec/helpers/types_helper_spec.rb b/spec/helpers/types_helper_spec.rb
index 140eba9ee4d..90515dc03c0 100644
--- a/spec/helpers/types_helper_spec.rb
+++ b/spec/helpers/types_helper_spec.rb
@@ -71,6 +71,7 @@ RSpec.describe TypesHelper do
 
       it "has a proper structure" do
         # The group's name/key
+        expect(subject.first[:key]).to eq "group one"
         expect(subject.first[:name]).to eq "group one"
 
         # The groups attributes
@@ -78,6 +79,14 @@ RSpec.describe TypesHelper do
         expect(subject.first[:attributes].first[:key]).to eq "date"
         expect(subject.first[:attributes].first[:translation]).to eq "Date"
       end
+
+      it "includes the key for built-in groups" do
+        allow(type)
+          .to receive(:attribute_groups)
+          .and_return [Type::AttributeGroup.new(type, :details, ["date"])]
+
+        expect(subject.first[:key]).to eq :details
+      end
     end
   end
 end
diff --git a/spec/helpers/work_packages_helper_spec.rb b/spec/helpers/work_packages_helper_spec.rb
index 20c06a8cf70..70397371df1 100644
--- a/spec/helpers/work_packages_helper_spec.rb
+++ b/spec/helpers/work_packages_helper_spec.rb
@@ -90,6 +90,23 @@ RSpec.describe WorkPackagesHelper do
         expect(helper.link_to_work_package(stub_work_package)).to have_no_text(text)
       end
     end
+
+    describe "in semantic mode",
+             with_flag: { semantic_work_package_ids: true },
+             with_settings: { work_packages_identifier: "semantic" } do
+      let(:stub_work_package) { build_stubbed(:work_package, type: stub_type, identifier: "MACROPROJ-42") }
+
+      it "uses the semantic identifier in the visible link label" do
+        link_text = Regexp.new("^#{stub_type.name} MACROPROJ-42:$")
+        expect(helper.link_to_work_package(stub_work_package))
+          .to have_css("a[href='#{work_package_path(stub_work_package)}']", text: link_text)
+      end
+
+      it "does not embed the bare numeric `#N` form in the link label" do
+        result = helper.link_to_work_package(stub_work_package)
+        expect(result).to have_no_css("a", text: /##{stub_work_package.id}:/)
+      end
+    end
   end
 
   describe "#work_packages_columns_options" do
diff --git a/spec/lib/open_project/journal_formatter/cause_spec.rb b/spec/lib/open_project/journal_formatter/cause_spec.rb
index 6ded9787da4..58e4138570a 100644
--- a/spec/lib/open_project/journal_formatter/cause_spec.rb
+++ b/spec/lib/open_project/journal_formatter/cause_spec.rb
@@ -154,6 +154,30 @@ RSpec.describe OpenProject::JournalFormatter::Cause do
         )
       end
     end
+
+    context "in semantic mode",
+            with_flag: { semantic_work_package_ids: true },
+            with_settings: { work_packages_identifier: "semantic" } do
+      let(:semantic_project) { create(:project, identifier: "MACROPROJ") }
+      let(:work_package) { create(:work_package, project: semantic_project) }
+
+      before do
+        work_package.allocate_and_register_semantic_id
+        allow(WorkPackage).to receive(:visible).with(User.current).and_return(WorkPackage.where(id: work_package.id))
+      end
+
+      it "renders the related work package's formatted_id in raw text mode" do
+        wp = work_package.reload
+        expect(cause).to render_raw_variant(a_string_including(wp.formatted_id))
+        expect(cause).not_to render_raw_variant(a_string_including("##{wp.id}"))
+      end
+
+      it "renders the related work package's formatted_id in the link label in HTML mode" do
+        wp = work_package.reload
+        expect(cause).to render_html_variant(a_string_including("#{wp.formatted_id}:"))
+        expect(cause).not_to render_html_variant(a_string_including(" ##{wp.id}:"))
+      end
+    end
   end
 
   context "when the change was caused by a change to a predecessor" do
diff --git a/spec/models/exports/pdf/common/markdown/md2_pdf_export_spec.rb b/spec/models/exports/pdf/common/markdown/md2_pdf_export_spec.rb
new file mode 100644
index 00000000000..813c3b584b4
--- /dev/null
+++ b/spec/models/exports/pdf/common/markdown/md2_pdf_export_spec.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Exports::PDF::Common::Markdown::MD2PDFExport do
+  let(:exporter) { described_class.allocate }
+  let(:type) { build_stubbed(:type, name: "Bug") }
+  let(:status) { build_stubbed(:status, name: "In Progress") }
+  let(:work_package) do
+    build_stubbed(:work_package, type:, status:, subject: "Fix login")
+  end
+
+  describe "#wp_mention_macro" do
+    let(:admin) { create(:admin) }
+    let(:wp) { create(:work_package) }
+
+    before do
+      User.current = admin
+    end
+
+    context "in classic mode",
+            with_flag: { semantic_work_package_ids: false } do
+      it "generates a link URL with the numeric id" do
+        result = exporter.wp_mention_macro("##{wp.id}", wp.id.to_s, {})
+        expect(result.first[:link]).to include(wp.id.to_s)
+      end
+    end
+
+    context "in semantic mode",
+            with_flag: { semantic_work_package_ids: true },
+            with_settings: { work_packages_identifier: "semantic" } do
+      it "generates a link URL with the semantic identifier" do
+        result = exporter.wp_mention_macro("##{wp.id}", wp.id.to_s, {})
+        expect(result.first[:link]).to include(wp.identifier)
+      end
+    end
+  end
+
+  describe "#expand_wp_mention" do
+    context "in classic mode", with_settings: { work_packages_identifier: "classic" } do
+      it "returns formatted_id for level 1" do
+        expect(exporter.expand_wp_mention(work_package, "##{work_package.id}"))
+          .to eq("##{work_package.id}")
+      end
+
+      it "uses formatted_id in level 2 expansion" do
+        result = exporter.expand_wp_mention(work_package, "###{work_package.id}")
+        expect(result).to eq("Bug ##{work_package.id}: Fix login")
+      end
+
+      it "uses formatted_id in level 3 expansion" do
+        allow(exporter).to receive(:work_package_dates).with(work_package).and_return("")
+        result = exporter.expand_wp_mention(work_package, "####{work_package.id}")
+        expect(result).to eq("In Progress Bug ##{work_package.id}: Fix login")
+      end
+    end
+
+    context "in semantic mode",
+            with_flag: { semantic_work_package_ids: true },
+            with_settings: { work_packages_identifier: "semantic" } do
+      before { work_package.identifier = "PROJ-42" }
+
+      it "returns semantic formatted_id for level 1" do
+        expect(exporter.expand_wp_mention(work_package, "##{work_package.id}"))
+          .to eq("PROJ-42")
+      end
+
+      it "uses semantic formatted_id in level 2 expansion" do
+        result = exporter.expand_wp_mention(work_package, "###{work_package.id}")
+        expect(result).to eq("Bug PROJ-42: Fix login")
+      end
+
+      it "uses semantic formatted_id in level 3 expansion" do
+        allow(exporter).to receive(:work_package_dates).with(work_package).and_return("")
+        result = exporter.expand_wp_mention(work_package, "####{work_package.id}")
+        expect(result).to eq("In Progress Bug PROJ-42: Fix login")
+      end
+    end
+  end
+end
diff --git a/spec/models/projects/identifier_spec.rb b/spec/models/projects/identifier_spec.rb
index e20c1d3c023..57f42cf0ee6 100644
--- a/spec/models/projects/identifier_spec.rb
+++ b/spec/models/projects/identifier_spec.rb
@@ -75,6 +75,14 @@ RSpec.describe Projects::Identifier do
       expect(project.identifier).to eq("foo")
     end
 
+    it "generates a valid identifier for an all-numeric name" do
+      project = Project.new(name: "12345")
+
+      project.validate
+
+      expect(project.identifier).to match(Projects::Identifier::CLASSIC_IDENTIFIER_FORMAT)
+    end
+
     it "is not allowed to clash with projects routing" do
       expect(reserved).not_to be_empty
 
@@ -103,9 +111,9 @@ RSpec.describe Projects::Identifier do
       end.to raise_error(ActiveRecord::RecordNotUnique)
     end
 
-    # The acts_as_url plugin defines validation callbacks on :create and it is not automatically
-    # called when calling a custom context. However we need the acts_as_url callback to set the
-    # identifier when the validations are called with the :saving_custom_fields context.
+    # The identifier-generation callback fires on :create and is not automatically called when
+    # validating with a custom context. The validation_context override ensures it still runs
+    # when the validations are called with the :saving_custom_fields context.
     context "when validating with :saving_custom_fields context" do
       it "is set from name" do
         project = Project.new(name: "foo")
diff --git a/spec/models/user_card_view_spec.rb b/spec/models/user_card_view_spec.rb
index 384d17d0a7c..ced0168a1af 100644
--- a/spec/models/user_card_view_spec.rb
+++ b/spec/models/user_card_view_spec.rb
@@ -97,10 +97,15 @@ RSpec.describe UserCardView do
   end
 
   describe "#results" do
-    let!(:alice)  { create(:user, firstname: "Alice", lastname: "Anderson") }
+    # UserQuery scopes to users visible to the current user. Granting alice
+    # :view_all_principals lets her see every user without introducing an
+    # extra admin record that would pollute `contain_exactly` expectations.
+    let!(:alice)  { create(:user, firstname: "Alice", lastname: "Anderson", global_permissions: %i[view_all_principals]) }
     let!(:bob)    { create(:user, firstname: "Bob",   lastname: "Brown") }
     let!(:locked) { create(:locked_user, firstname: "Carol", lastname: "Clark") }
 
+    before { login_as(alice) }
+
     it "returns nil when there is no query" do
       expect(view.results).to be_nil
     end
diff --git a/spec/models/user_query_integration_spec.rb b/spec/models/user_query_integration_spec.rb
index 5577b345299..5da15845209 100644
--- a/spec/models/user_query_integration_spec.rb
+++ b/spec/models/user_query_integration_spec.rb
@@ -50,7 +50,10 @@ RSpec.describe UserQuery, "integration" do
   shared_let(:designer_option) { job_title_cf.custom_options.find_by(value: "Designer") }
   shared_let(:pm_option) { job_title_cf.custom_options.find_by(value: "Project Manager") }
 
-  shared_let(:alice) { create(:user, firstname: "Alice", lastname: "Anders") }
+  # Alice is the logged-in user across most examples; she needs view_all_principals
+  # so the existing filter/order expectations enumerate every seeded user.
+  # Visibility behaviour is exercised separately in the `describe "visibility"` block.
+  shared_let(:alice) { create(:user, firstname: "Alice", lastname: "Anders", global_permissions: %i[view_all_principals]) }
   shared_let(:bob) { create(:user, firstname: "Bob", lastname: "Bauer") }
   shared_let(:carol) { create(:user, firstname: "Carol", lastname: "Cohen") }
   shared_let(:dave) { create(:user, firstname: "Dave", lastname: "Doe") }
@@ -234,6 +237,57 @@ RSpec.describe UserQuery, "integration" do
     end
   end
 
+  describe "visibility" do
+    # Override the outer admin login so each context can pin down its own viewer.
+    let(:viewer) { create(:user, firstname: "Viewer", lastname: "Visible") }
+
+    before { login_as(viewer) }
+
+    context "when the current user is an admin" do
+      let(:viewer) { create(:admin, firstname: "Viewer", lastname: "Admin") }
+
+      it "returns every active user" do
+        expect(query.results).to include(alice, bob, carol, dave, locked_eve, viewer)
+      end
+    end
+
+    context "when the current user has the :view_all_principals global permission" do
+      let(:viewer) do
+        create(:user, firstname: "Viewer", lastname: "Global",
+                      global_permissions: %i[view_all_principals])
+      end
+
+      it "returns every active user" do
+        expect(query.results).to include(alice, bob, carol, dave, locked_eve, viewer)
+      end
+    end
+
+    context "when the current user has no view permission and no shared membership" do
+      it "only sees themselves" do
+        expect(query.results).to contain_exactly(viewer)
+      end
+
+      it "sees other users that share a project membership" do
+        role = create(:project_role)
+        project = create(:project)
+        create(:member, principal: viewer, project: project, roles: [role])
+        create(:member, principal: alice, project: project, roles: [role])
+
+        expect(query.results).to contain_exactly(viewer, alice)
+      end
+
+      it "sees other users that share a group membership" do
+        create(:group, members: [viewer, alice])
+
+        expect(query.results).to contain_exactly(viewer, alice)
+      end
+
+      it "does not see users that share neither a project nor a group" do
+        expect(query.results).not_to include(bob, carol, dave, locked_eve)
+      end
+    end
+  end
+
   describe "PersistedQuery round-trip" do
     it "persists and re-runs a UserQuery with a CF filter" do
       query.where(job_title_cf.column_name, "=", [developer_option.id.to_s])
diff --git a/spec/models/user_query_spec.rb b/spec/models/user_query_spec.rb
index 65e7b4c62d9..4bdb723dd66 100644
--- a/spec/models/user_query_spec.rb
+++ b/spec/models/user_query_spec.rb
@@ -31,6 +31,11 @@
 require "spec_helper"
 
 RSpec.describe UserQuery do
+  # The query default scope filters to users visible to the current user.
+  # Admins satisfy `view_all_principals`, so `User.user.visible(admin)` is a no-op,
+  # keeping the SQL identical to the hand-written expectations.
+  current_user { create(:admin) }
+
   let(:instance) { described_class.new(name: "Users") }
   let(:base_scope) { User.user.order(id: :desc) }
 
diff --git a/spec/models/work_package/pdf_export/document_generator_spec.rb b/spec/models/work_package/pdf_export/document_generator_spec.rb
index 99d6d586f59..72fb8d91af4 100644
--- a/spec/models/work_package/pdf_export/document_generator_spec.rb
+++ b/spec/models/work_package/pdf_export/document_generator_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe WorkPackage::PDFExport::DocumentGenerator do
   include Redmine::I18n
   include PDFExportSpecUtils
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, name: "PDF Project") }
   let(:user) { create(:admin) }
   let(:description) do
     "This is a test description with an macro: workPackageValue:assignee"
@@ -20,7 +20,7 @@ RSpec.describe WorkPackage::PDFExport::DocumentGenerator do
            subject: "Document Generator Specs",
            type:)
   end
-  let(:type) { create(:type) }
+  let(:type) { create(:type, name: "Feature") }
   let(:options) do
     {}
   end
@@ -52,6 +52,25 @@ RSpec.describe WorkPackage::PDFExport::DocumentGenerator do
     PDF::Inspector::Text.analyze(content).strings
   end
 
+  describe "#title" do
+    context "in classic mode",
+            with_flag: { semantic_work_package_ids: false } do
+      it "uses the numeric id in the filename" do
+        expected_title = "PDF_Project_Feature_#{work_package.id}_Document_Generator_Specs_2023-06-30_23-59.pdf"
+        expect(export_pdf.title).to eql(expected_title)
+      end
+    end
+
+    context "in semantic mode",
+            with_flag: { semantic_work_package_ids: true },
+            with_settings: { work_packages_identifier: "semantic" } do
+      it "uses the semantic identifier in the filename" do
+        expected_title = "PDF_Project_Feature_#{work_package.identifier}_Document_Generator_Specs_2023-06-30_23-59.pdf"
+        expect(export_pdf.title).to eql(expected_title)
+      end
+    end
+  end
+
   describe "with a request for a PDF" do
     it "contains correct data" do
       expected_result = [
@@ -65,6 +84,15 @@ RSpec.describe WorkPackage::PDFExport::DocumentGenerator do
       expect(result.join(" ")).to eq(expected_result.join(" "))
     end
 
+    describe "with a work package mention in the description" do
+      let(:other_work_package) { create(:work_package, project:, type:) }
+      let(:description) { "##{other_work_package.id}" }
+
+      it "renders the mention using formatted_id" do
+        expect(pdf).to include(other_work_package.formatted_id)
+      end
+    end
+
     describe "with a request for a PDF with hyphenation and no header/footer text" do
       let(:options) do
         {
diff --git a/spec/models/work_package/semantic_identifier_spec.rb b/spec/models/work_package/semantic_identifier_spec.rb
index d6de9c83cb0..1de9d8c2956 100644
--- a/spec/models/work_package/semantic_identifier_spec.rb
+++ b/spec/models/work_package/semantic_identifier_spec.rb
@@ -266,6 +266,18 @@ RSpec.describe WorkPackage::SemanticIdentifier do
       end
     end
 
+    context "with id: keyword and blank string" do
+      it "does not treat an empty id as a semantic identifier" do
+        expect { WorkPackage.find_by(id: "") }.not_to raise_error
+        expect(WorkPackage.find_by(id: "")).to be_nil
+      end
+
+      it "does not treat whitespace-only id as semantic" do
+        expect { WorkPackage.find_by(id: "  \t  ") }.not_to raise_error
+        expect(WorkPackage.find_by(id: "  \t  ")).to be_nil
+      end
+    end
+
     context "with id: keyword and an array" do
       let(:work_package2) { create(:work_package, project:) }
 
@@ -390,10 +402,33 @@ RSpec.describe WorkPackage::SemanticIdentifier do
       expect(WorkPackage.where_display_id_in([])).to be_empty
     end
 
+    it "treats a blank string as no input" do
+      relation = WorkPackage.where_display_id_in("")
+      expect(relation).to be_empty
+      # Without filtering, "".to_i would build WHERE id = 0 — semantically wrong
+      # even though no row matches in practice.
+      expect(relation.to_sql).not_to match(/"id"\s*=\s*0\b/)
+      expect(relation.to_sql).not_to match(/"id"\s+IN\s*\(0\)/)
+    end
+
+    it "treats whitespace-only strings as no input" do
+      expect(WorkPackage.where_display_id_in("   ")).to be_empty
+    end
+
+    it "drops blank entries from arrays without poisoning the rest of the set" do
+      expect(WorkPackage.where_display_id_in(["MYPROJ-1", "", "  ", nil]))
+        .to contain_exactly(work_package)
+    end
+
     it "wraps a single non-array value" do
       expect(WorkPackage.where_display_id_in("MYPROJ-1")).to contain_exactly(work_package)
     end
 
+    it "accepts identifiers as varargs" do
+      expect(WorkPackage.where_display_id_in("MYPROJ-1", "MYPROJ-2"))
+        .to contain_exactly(work_package, work_package2)
+    end
+
     it "resolves a single numeric string" do
       expect(WorkPackage.where_display_id_in([work_package.id.to_s])).to contain_exactly(work_package)
     end
@@ -459,6 +494,62 @@ RSpec.describe WorkPackage::SemanticIdentifier do
     end
   end
 
+  describe "ID_ROUTE_CONSTRAINT" do
+    # Rails wraps route-constraint regexps with `\A…\z` when matching a path
+    # segment, so the spec uses an anchored regex to model the way the
+    # constant is actually used. This pins the composition with
+    # SEMANTIC_ID_PATTERN so a future change to the upstream prefix or
+    # sequence shape can't silently widen what the routes accept.
+    let(:anchored) { /\A(?:#{described_class::ID_ROUTE_CONSTRAINT.source})\z/ }
+
+    it "matches numeric work package ids" do
+      expect(anchored.match?("123")).to be true
+    end
+
+    it "matches semantic work package identifiers" do
+      expect(anchored.match?("PROJ-7")).to be true
+    end
+
+    it "rejects lowercased semantic shapes" do
+      expect(anchored.match?("proj-7")).to be false
+    end
+  end
+
+  describe ".numeric_id? and .semantic_id?" do
+    # `numeric_id?` answers a shape question (canonical numeric ID),
+    # `semantic_id?` answers a routing question (needs identifier/alias
+    # lookup). For Strings the two are mutually exclusive; Integers are
+    # numeric-only (no string-lookup routing applies).
+    [
+      ["123",     :numeric],
+      ["0",       :numeric],
+      [" 123 ",   :numeric],
+      [123,       :numeric],
+      [0,         :numeric],
+      ["0123",    :semantic],
+      ["00",      :semantic],
+      ["PROJ-1",  :semantic],
+      ["abc",     :semantic],
+      ["",        :neither],
+      [nil,       :neither],
+      [{},        :neither]
+    ].each do |value, classification|
+      it "routes #{value.inspect} to #{classification}" do
+        case classification
+        when :numeric
+          expect(described_class.numeric_id?(value)).to be true
+          expect(described_class.semantic_id?(value)).to be false
+        when :semantic
+          expect(described_class.semantic_id?(value)).to be true
+          expect(described_class.numeric_id?(value)).to be false
+        when :neither
+          expect(described_class.numeric_id?(value)).to be false
+          expect(described_class.semantic_id?(value)).to be false
+        end
+      end
+    end
+  end
+
   describe "#display_id" do
     context "when semantic mode is active",
             with_flag: { semantic_work_package_ids: true },
diff --git a/spec/models/work_package_spec.rb b/spec/models/work_package_spec.rb
index e797d5075e0..afdedae635e 100644
--- a/spec/models/work_package_spec.rb
+++ b/spec/models/work_package_spec.rb
@@ -943,4 +943,31 @@ RSpec.describe WorkPackage do
       end
     end
   end
+
+  describe "#to_s" do
+    let(:task_type) { create(:type_task) }
+
+    context "in classic mode",
+            with_flag: { semantic_work_package_ids: false },
+            with_settings: { work_packages_identifier: "classic" } do
+      let(:work_package) { create(:work_package, project:, type: task_type, subject: "Hello world") }
+
+      it "renders the numeric id with a `#` prefix" do
+        expect(work_package.to_s).to eq("Task ##{work_package.id}: Hello world")
+      end
+    end
+
+    context "in semantic mode",
+            with_flag: { semantic_work_package_ids: true },
+            with_settings: { work_packages_identifier: "semantic" } do
+      let(:project) { create(:project, identifier: "MACROPROJ", types: [task_type]) }
+      let(:work_package) { create(:work_package, project:, type: task_type, subject: "Hello world") }
+
+      it "renders the semantic identifier without a `#` prefix" do
+        wp = work_package.reload
+        expect(wp.to_s).to eq("Task #{wp.display_id}: Hello world")
+        expect(wp.to_s).not_to include("##{wp.id}")
+      end
+    end
+  end
 end
diff --git a/spec/models/work_packages/pdf_export/work_package_list_to_pdf_gantt_spec.rb b/spec/models/work_packages/pdf_export/work_package_list_to_pdf_gantt_spec.rb
index 01b34feb97f..456a94402b2 100644
--- a/spec/models/work_packages/pdf_export/work_package_list_to_pdf_gantt_spec.rb
+++ b/spec/models/work_packages/pdf_export/work_package_list_to_pdf_gantt_spec.rb
@@ -177,7 +177,8 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
   end
 
   def wp_title_column(work_package)
-    "#{work_package.type} ##{work_package.id} • #{work_package.status} • #{wp_title_dates work_package} #{work_package.subject}"
+    "#{work_package.type} #{work_package.formatted_id} • #{work_package.status} • " \
+      "#{wp_title_dates work_package} #{work_package.subject}"
   end
 
   subject(:pdf) do
@@ -225,6 +226,24 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
     end
   end
 
+  describe "work package id formatting" do
+    context "in classic mode",
+            with_flag: { semantic_work_package_ids: false } do
+      it "uses the numeric id and not the semantic identifier in the gantt chart" do
+        expect(pdf[:strings]).to include("##{work_package_task.id}")
+      end
+    end
+
+    context "in semantic mode",
+            with_flag: { semantic_work_package_ids: true },
+            with_settings: { work_packages_identifier: "semantic" } do
+      it "uses the semantic identifier and not the numeric id in the gantt chart" do
+        expect(pdf[:strings]).to include(work_package_task.identifier)
+        expect(pdf[:strings]).not_to include("##{work_package_task.id}")
+      end
+    end
+  end
+
   describe "with a request for a PDF gantt split on multiple horizontal pages" do
     let(:work_package_milestone_due) do
       Date.new(2024, 5, 8)
diff --git a/spec/models/work_packages/pdf_export/work_package_list_to_pdf_spec.rb b/spec/models/work_packages/pdf_export/work_package_list_to_pdf_spec.rb
index 9d09273d68e..361e9d8167f 100644
--- a/spec/models/work_packages/pdf_export/work_package_list_to_pdf_spec.rb
+++ b/spec/models/work_packages/pdf_export/work_package_list_to_pdf_spec.rb
@@ -132,7 +132,7 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
 
   def work_package_columns(work_package)
     [
-      work_package.id.to_s,
+      work_package.display_id.to_s,
       work_package.subject,
       work_package.status.name,
       work_package.story_points.to_s,
@@ -148,7 +148,7 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
   def work_package_details(work_package, index, ltfs = [])
     result = [
       "#{index}.", work_package.subject,
-      column_title(:id), work_package.id.to_s,
+      column_title(:id), work_package.display_id.to_s,
       column_title(:status), work_package.status.name,
       column_title(:story_points), work_package.story_points.to_s,
       column_title(:done_ratio), work_package_done_ratio(work_package),
@@ -250,12 +250,12 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
 
             project_phase_with_gates.name,
             *column_titles - ["Project phase"],
-            work_package_parent.id.to_s,
+            work_package_parent.display_id.to_s,
             work_package_parent.subject,
 
             project_phase.name,
             *column_titles - ["Project phase"],
-            work_package_child.id.to_s,
+            work_package_child.display_id.to_s,
             work_package_child.subject
           ]
           strings = pdf_strings_without_footers(1)
@@ -453,7 +453,7 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
 
     def relation_table_row(work_package)
       [
-        work_package.id.to_s,
+        work_package.display_id.to_s,
         work_package.type.name,
         work_package.subject,
         work_package.status.name
@@ -463,7 +463,7 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageListToPdf do
     def detail_attributes(work_package, index)
       [
         "#{index}.", work_package.subject,
-        column_title(:id), work_package.id.to_s,
+        column_title(:id), work_package.display_id.to_s,
         column_title(:status), work_package.status.name
       ]
     end
diff --git a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb
index ce118495270..3e57cfa4c90 100644
--- a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb
+++ b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb
@@ -235,7 +235,7 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf do
   end
   let(:expected_details) do
     [
-      "#{type.name} ##{work_package.id} - #{work_package.subject}",
+      "#{type.name} #{work_package.formatted_id} - #{work_package.subject}",
       " ", exporter.prawn_badge_text_stuffing(work_package.status.name.downcase), # badge & padding
       "People",
       "Assignee", user.name,
diff --git a/spec/requests/api/v3/authentication_spec.rb b/spec/requests/api/v3/authentication_spec.rb
index 36ab7eb7830..49413a5fd97 100644
--- a/spec/requests/api/v3/authentication_spec.rb
+++ b/spec/requests/api/v3/authentication_spec.rb
@@ -42,6 +42,67 @@ RSpec.describe "API V3 Authentication" do
   end
   let(:resource_metadata) { 'resource_metadata="http://test.host/.well-known/oauth-protected-resource"' }
 
+  describe "session auth" do
+    let(:user) { create(:admin) }
+    let(:session_data) { ActiveSupport::HashWithIndifferentAccess.new(user_id: user.id, updated_at: Time.current) }
+
+    before do
+      # rubocop:disable RSpec/AnyInstance
+      allow_any_instance_of(OpenProject::Authentication::Strategies::Warden::Session)
+        .to receive(:session)
+        .and_return(session_data)
+      # rubocop:enable RSpec/AnyInstance
+    end
+
+    context "when making a GET request" do
+      before do
+        get resource
+      end
+
+      it "authenticates successfully" do
+        expect(last_response).to have_http_status :ok
+      end
+    end
+
+    context "when making a POST request" do
+      let(:add_additional_headers) { nil }
+
+      before do
+        header "Content-Type", "application/json"
+        add_additional_headers
+        post resource, { name: "Test" }.to_json
+      end
+
+      it "is not authenticated" do
+        expect(last_response).to have_http_status :unauthorized
+      end
+
+      context "and when the Sec-Fetch-Site header indicates a same-origin request" do
+        let(:add_additional_headers) { header "Sec-Fetch-Site", "same-origin" }
+
+        it "authenticates successfully" do
+          expect(last_response).to have_http_status :created
+        end
+      end
+
+      context "and when the Sec-Fetch-Site header indicates a cross-site request" do
+        let(:add_additional_headers) { header "Sec-Fetch-Site", "cross-site" }
+
+        it "is not authenticated" do
+          expect(last_response).to have_http_status :unauthorized
+        end
+      end
+
+      context "and when the Sec-Fetch-Site header indicates a same-site request" do
+        let(:add_additional_headers) { header "Sec-Fetch-Site", "same-site" }
+
+        it "is not authenticated" do
+          expect(last_response).to have_http_status :unauthorized
+        end
+      end
+    end
+  end
+
   describe "oauth" do
     let(:oauth_access_token) { "" }
     let(:expected_message) { "You did not provide the correct credentials." }
diff --git a/spec/requests/api/v3/projects/create_resource_spec.rb b/spec/requests/api/v3/projects/create_resource_spec.rb
index 517d821e2ba..03641e4c8c3 100644
--- a/spec/requests/api/v3/projects/create_resource_spec.rb
+++ b/spec/requests/api/v3/projects/create_resource_spec.rb
@@ -82,6 +82,19 @@ RSpec.describe "API v3 Project resource create", content_type: :json do
       .at_path("name")
   end
 
+  context "with an all-numeric name and no identifier",
+          with_settings: { work_packages_identifier: "classic" } do
+    let(:body) { { name: "12345" }.to_json }
+
+    it "responds with 201 CREATED" do
+      expect(last_response).to have_http_status(:created)
+    end
+
+    it "creates the project with a valid non-all-numeric identifier" do
+      expect(Project.last.identifier).to match(Projects::Identifier::CLASSIC_IDENTIFIER_FORMAT)
+    end
+  end
+
   context "with a status" do
     let(:body) do
       {
diff --git a/spec/requests/api/v3/root_resource_spec.rb b/spec/requests/api/v3/root_resource_spec.rb
index c8c2d0aa490..ae96ac183a4 100644
--- a/spec/requests/api/v3/root_resource_spec.rb
+++ b/spec/requests/api/v3/root_resource_spec.rb
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
@@ -82,13 +82,6 @@ RSpec.describe "API v3 Root resource" do
         expect(subject).to have_json_path("instanceName")
       end
 
-      context "without the X-requested-with header", :skip_xhr_header do
-        it "returns OK because GET requests are allowed" do
-          expect(response).to have_http_status(:ok)
-          expect(subject).to have_json_path("instanceName")
-        end
-      end
-
       context "with content-type application/hal+json" do
         before do
           header("Content-Type", "application/hal+json")
diff --git a/spec/requests/oauth_clients/callback_flow_spec.rb b/spec/requests/oauth_clients/callback_flow_spec.rb
index ef853c9147d..94404c6364b 100644
--- a/spec/requests/oauth_clients/callback_flow_spec.rb
+++ b/spec/requests/oauth_clients/callback_flow_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe "OAuthClient callback endpoint" do
   context "when user is not logged in" do
     it "requires login" do
       get uri.to_s
-      expect(last_response).to have_http_status(:unauthorized)
+      expect(last_response).to have_http_status(:found)
     end
   end
 
@@ -72,7 +72,7 @@ RSpec.describe "OAuthClient callback endpoint" do
 
       allow(Rack::OAuth2::Client).to receive(:new).and_return(rack_oauth2_client)
       allow(rack_oauth2_client)
-        .to receive(:access_token!)
+        .to(receive(:access_token!))
         .with(:body)
         .and_return(Rack::OAuth2::AccessToken::Bearer.new(access_token: "xyzaccesstoken",
                                                           refresh_token: "xyzrefreshtoken",
diff --git a/spec/requests/oauth_clients/ensure_connection_flow_spec.rb b/spec/requests/oauth_clients/ensure_connection_flow_spec.rb
index 3b640c222bd..0a70143a497 100644
--- a/spec/requests/oauth_clients/ensure_connection_flow_spec.rb
+++ b/spec/requests/oauth_clients/ensure_connection_flow_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe "/oauth_clients/:oauth_client_id/ensure_connection endpoint", :we
     context "when user is not logged in" do
       it "requires login" do
         get oauth_clients_ensure_connection_url(oauth_client_id: oauth_client.client_id)
-        expect(last_response).to have_http_status(:unauthorized)
+        expect(last_response).to have_http_status(:found)
       end
     end
 
diff --git a/spec/requests/rate_limiting/api_v3_rate_limiting_spec.rb b/spec/requests/rate_limiting/api_v3_rate_limiting_spec.rb
index 666da1d8093..79229f0aad7 100644
--- a/spec/requests/rate_limiting/api_v3_rate_limiting_spec.rb
+++ b/spec/requests/rate_limiting/api_v3_rate_limiting_spec.rb
@@ -49,14 +49,20 @@ RSpec.describe "Rate limiting APIv3",
       6.times do
         post "/api/v3/work_packages/form",
              nil,
-             "CONTENT_TYPE" => "application/json"
+             "CONTENT_TYPE" => "application/json",
+             # we need to emulate a valid session authentication,
+             # as the anonymous fallback does not work with rate limiting in the test setup
+             "HTTP_SEC_FETCH_SITE" => "same-origin"
 
         expect(last_response).to have_http_status :ok
       end
 
       post "/api/v3/work_packages/form",
            nil,
-           "CONTENT_TYPE" => "application/json"
+           "CONTENT_TYPE" => "application/json",
+           # we need to emulate a valid session authentication,
+           # as the anonymous fallback does not work with rate limiting in the test setup
+           "HTTP_SEC_FETCH_SITE" => "same-origin"
       expect(last_response).to have_http_status :too_many_requests
     end
   end
diff --git a/spec/security/cookies_serializer_spec.rb b/spec/security/cookies_serializer_spec.rb
new file mode 100644
index 00000000000..3d8fbf1a8a4
--- /dev/null
+++ b/spec/security/cookies_serializer_spec.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+# Regression guard against the Marshal.load-via-encrypted-cookie RCE chain.
+# If anyone flips `cookies_serializer` back to :marshal or :hybrid, the
+# 2FA op2fa_remember_token cookie (and any future encrypted cookie) becomes
+# a pre-auth RCE primitive as soon as the signing key is known or leaks.
+
+require "spec_helper"
+
+# Canary class used to detect Marshal.load running against attacker-controlled
+# cookie payloads. Must be a named top-level constant so Marshal can dump and
+# reconstruct it by name. We record the invocation in a class-level flag because
+# the cookie jar swallows exceptions raised during deserialization — an
+# `expect { … }.not_to raise_error` assertion would not catch a regression.
+class CookieSerializerSpecMarshalCanary
+  @triggered = false
+  class << self
+    attr_accessor :triggered
+  end
+
+  def marshal_dump = "canary"
+
+  def marshal_load(_)
+    CookieSerializerSpecMarshalCanary.triggered = true
+  end
+end
+
+RSpec.describe "Cookie serializer" do # rubocop:disable RSpec/DescribeClass
+  it "is configured to :json (NEVER :marshal or :hybrid)" do
+    expect(Rails.application.config.action_dispatch.cookies_serializer).to eq(:json)
+  end
+
+  describe "encrypted cookie jar" do
+    # Forge a cookie whose ciphertext, after authenticated decryption, yields a
+    # Marshal payload. This mimics either (a) a cookie written by an older
+    # version of OpenProject when the serializer was :marshal, or (b) an attacker
+    # who knows SECRET_KEY_BASE (e.g. the historical OVERWRITE_ME for unconfigured
+    # docker containers) and crafts an exploit payload.
+    let(:marshal_payload) { Marshal.dump(CookieSerializerSpecMarshalCanary.new) }
+    let(:forged_cookie) do
+      salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
+      cipher = Rails.application.config.action_dispatch.encrypted_cookie_cipher || "aes-256-gcm"
+      key_len = ActiveSupport::MessageEncryptor.key_len(cipher)
+      secret = Rails.application.key_generator.generate_key(salt, key_len)
+
+      encryptor = ActiveSupport::MessageEncryptor.new(
+        secret,
+        cipher: cipher,
+        serializer: ActiveSupport::MessageEncryptor::NullSerializer
+      )
+      encryptor.encrypt_and_sign(marshal_payload, purpose: "cookie.op2fa_remember_token")
+    end
+
+    let(:cookie_jar) do
+      request = ActionDispatch::TestRequest.create
+      request.cookies["op2fa_remember_token"] = forged_cookie
+      ActionDispatch::Cookies::CookieJar.build(request, request.cookies)
+    end
+
+    before { CookieSerializerSpecMarshalCanary.triggered = false }
+
+    it "does not invoke Marshal.load on the cookie payload" do
+      # If the serializer were :marshal/:hybrid, the encrypted cookie jar would
+      # call Marshal.load on the decrypted payload, reconstructing the canary
+      # and setting its `triggered` flag. With :json, the JSON deserializer
+      # rejects the Marshal bytes and the jar returns nil — no Ruby objects
+      # are revived from attacker-controlled data.
+      cookie_jar.encrypted["op2fa_remember_token"]
+
+      expect(CookieSerializerSpecMarshalCanary.triggered).to be(false),
+                                                             "Marshal.load was invoked on attacker-controlled cookie payload — " \
+                                                             "cookies_serializer must be :json, not :marshal or :hybrid."
+    end
+  end
+end
diff --git a/spec/services/project_identifiers/classic_identifier_suggestion_generator_spec.rb b/spec/services/project_identifiers/classic_identifier_suggestion_generator_spec.rb
index 622b376226e..44105a356d6 100644
--- a/spec/services/project_identifiers/classic_identifier_suggestion_generator_spec.rb
+++ b/spec/services/project_identifiers/classic_identifier_suggestion_generator_spec.rb
@@ -63,6 +63,20 @@ RSpec.describe ProjectIdentifiers::ClassicIdentifierSuggestionGenerator do
       it "falls back to a randomised project-XXXXXX identifier" do
         expect(described_class.new.suggest_identifier("!!!")).to match(/\Aproject-[a-z0-9]{5}\z/)
       end
+
+      it "maps '.' to 'dot'" do
+        expect(described_class.new.suggest_identifier(".")).to eq("dot")
+      end
+
+      it "maps '!' to 'bang'" do
+        expect(described_class.new.suggest_identifier("!")).to eq("bang")
+      end
+    end
+
+    context "when the name is all-numeric" do
+      it "falls back to a randomised project-XXXXXX identifier" do
+        expect(described_class.new.suggest_identifier("12345")).to match(/\Aproject-[a-z0-9]{5}\z/)
+      end
     end
   end
 
diff --git a/spec/services/project_identifiers/convert_project_to_semantic_service_spec.rb b/spec/services/project_identifiers/convert_project_to_semantic_service_spec.rb
index c8324402633..ca41c09ae26 100644
--- a/spec/services/project_identifiers/convert_project_to_semantic_service_spec.rb
+++ b/spec/services/project_identifiers/convert_project_to_semantic_service_spec.rb
@@ -113,6 +113,12 @@ RSpec.describe ProjectIdentifiers::ConvertProjectToSemanticService,
       it "backfills WPs using the new identifier" do
         expect(wp.reload.identifier).to eq("#{project.reload.identifier}-1")
       end
+
+      it "does not enqueue Notifications::WorkflowJob for the identifier change" do
+        project2 = create(:project, name: "Another Project")
+        expect { described_class.new(project2).call }
+          .not_to have_enqueued_job(Notifications::WorkflowJob)
+      end
     end
 
     context "when the only natural suggestion is a system-reserved keyword" do
diff --git a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb b/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb
index 409b195f503..25b52bf6adc 100644
--- a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb
+++ b/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb
@@ -45,6 +45,15 @@ RSpec.describe ProjectIdentifiers::RevertProjectToClassicService do
       it "restores the classic identifier" do
         expect(project.reload.identifier).to eq("my-app")
       end
+
+      it "does not enqueue Notifications::WorkflowJob for the identifier change" do
+        project2 = create(:project).tap do |p|
+          p.update_columns(identifier: "OTHER", wp_sequence_counter: 0)
+          FriendlyId::Slug.create!(sluggable: p, slug: "other-name")
+        end
+        expect { described_class.new(project2).call }
+          .not_to have_enqueued_job(Notifications::WorkflowJob)
+      end
     end
 
     context "when the project has multiple slugs in FriendlyId history" do
diff --git a/spec/services/work_package_types/attribute_groups/transformer_spec.rb b/spec/services/work_package_types/attribute_groups/transformer_spec.rb
index b57885d2645..fd006981433 100644
--- a/spec/services/work_package_types/attribute_groups/transformer_spec.rb
+++ b/spec/services/work_package_types/attribute_groups/transformer_spec.rb
@@ -40,7 +40,10 @@ RSpec.describe WorkPackageTypes::AttributeGroups::Transformer do
       let(:raw_groups) { [] }
 
       it "returns an empty array" do
-        expect(transformer.call).to eq([])
+        result = transformer.call
+
+        expect(result).to be_success
+        expect(result.result).to eq([])
       end
     end
 
@@ -60,7 +63,10 @@ RSpec.describe WorkPackageTypes::AttributeGroups::Transformer do
       end
 
       it "returns transformed group with symbolized key and attribute keys" do
-        expect(transformer.call).to eq([[:custom, ["custom_field_1", "custom_field_2"]]])
+        result = transformer.call
+
+        expect(result).to be_success
+        expect(result.result).to eq([[:custom, ["custom_field_1", "custom_field_2"], "Custom"]])
       end
     end
 
@@ -76,7 +82,10 @@ RSpec.describe WorkPackageTypes::AttributeGroups::Transformer do
       end
 
       it "uses name as group name" do
-        expect(transformer.call).to eq([["General Info", ["subject"]]])
+        result = transformer.call
+
+        expect(result).to be_success
+        expect(result.result).to eq([["General Info", ["subject"]]])
       end
     end
 
@@ -99,8 +108,9 @@ RSpec.describe WorkPackageTypes::AttributeGroups::Transformer do
 
       it "returns a group with a Query instance" do
         result = transformer.call
-        name, entries = result.first
+        name, entries = result.result.first
 
+        expect(result).to be_success
         expect(name).to eq("Embedded Table")
         expect(entries.first).to be_a(Query)
         expect(entries.first.name).to eq("Embedded table: Embedded Table")
@@ -118,8 +128,12 @@ RSpec.describe WorkPackageTypes::AttributeGroups::Transformer do
         ]
       end
 
-      it "raises JSON::ParserError" do
-        expect { transformer.call }.to raise_error(JSON::ParserError)
+      it "returns a failure result" do
+        result = transformer.call
+
+        expect(result).to be_failure
+        expect(result.errors.full_messages.to_sentence)
+          .to eq(I18n.t("types.edit.form_configuration.invalid_query"))
       end
     end
   end
diff --git a/spec/services/work_package_types/form_configuration_groups/create_service_spec.rb b/spec/services/work_package_types/form_configuration_groups/create_service_spec.rb
new file mode 100644
index 00000000000..5f5fe962041
--- /dev/null
+++ b/spec/services/work_package_types/form_configuration_groups/create_service_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+module WorkPackageTypes
+  module FormConfigurationGroups
+    RSpec.describe CreateService, type: :service, with_ee: %i[edit_attribute_groups] do
+      let(:user) { create(:admin) }
+      let(:type) { create(:type) }
+      let(:relation_query_props) do
+        query = create(:query, user:)
+        query.add_filter("parent", "=", [Queries::Filters::TemplatedValue::KEY])
+        query.save!
+
+        ::API::V3::Queries::QueryParamsRepresenter
+          .new(query)
+          .to_json
+      end
+
+      subject(:service) { described_class.new(user:, type:) }
+
+      it "creates an attribute group from service params" do
+        result = service.call(group_type: "attribute", name: "New Group")
+
+        expect(result).to be_success
+        expect(result.result).to be_a(Type::AttributeGroup)
+        expect(result.result.key).to eq("New Group")
+        expect(type.reload.attribute_groups.first.key).to eq(result.result.key)
+      end
+
+      it "creates a query group from service params" do
+        result = service.call(group_type: "query", name: "Related work", query_props: relation_query_props)
+
+        expect(result).to be_success
+        expect(result.result).to be_a(Type::QueryGroup)
+        expect(result.result.key).to eq("Related work")
+        expect(result.result.attributes).to be_a(Query)
+        expect(type.reload.attribute_groups.first.key).to eq(result.result.key)
+      end
+    end
+  end
+end
diff --git a/spec/services/work_package_types/form_configuration_rows/update_service_spec.rb b/spec/services/work_package_types/form_configuration_rows/update_service_spec.rb
new file mode 100644
index 00000000000..fc3843f51cb
--- /dev/null
+++ b/spec/services/work_package_types/form_configuration_rows/update_service_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+module WorkPackageTypes
+  module FormConfigurationRows
+    RSpec.describe UpdateService, type: :service, with_ee: %i[edit_attribute_groups] do
+      let(:user) { create(:admin) }
+      let(:type) { create(:type, name: "Legacy type") }
+
+      subject(:service) { described_class.new(user:, type:, row_key: "priority") }
+
+      before do
+        type.update_column(:attribute_groups, [
+                             ["", ["assignee"]],
+                             [:details, ["priority"]]
+                           ])
+      end
+
+      it "normalizes unnamed legacy groups while updating rows" do
+        result = service.call(target_id: "inactive", position: 1)
+
+        expect(result).to be_success
+
+        normalized_group = type.reload.attribute_groups.find do |group|
+          group.translated_key == I18n.t("types.edit.form_configuration.untitled_group")
+        end
+
+        expect(normalized_group).to be_present
+        expect(normalized_group.key).to eq(I18n.t("types.edit.form_configuration.untitled_group"))
+      end
+
+      it "finds legacy symbol attribute keys when moving rows" do
+        type.update_column(:attribute_groups, [
+                             [:details, [:version]]
+                           ])
+
+        result = described_class.new(user:, type:, row_key: "version").call(target_id: "inactive", position: 1)
+
+        expect(result).to be_success
+        expect(type.reload.attribute_groups.flat_map(&:members)).not_to include("version")
+      end
+    end
+  end
+end
diff --git a/spec/services/work_package_types/update_service_spec.rb b/spec/services/work_package_types/update_service_spec.rb
index 3cd42e81b82..5ebbd6cd282 100644
--- a/spec/services/work_package_types/update_service_spec.rb
+++ b/spec/services/work_package_types/update_service_spec.rb
@@ -176,6 +176,32 @@ module WorkPackageTypes
         expect(query.filters.length).to eq(1)
         expect(query.filters[0].name).to eq(:status_id)
       end
+
+      it "returns a failure result for invalid query JSON" do
+        invalid_params = {
+          attribute_groups: [
+            { "type" => "query", "name" => "group1", "query" => "not a json" }
+          ]
+        }
+
+        result = service.call(invalid_params)
+
+        expect(result).to be_failure
+        expect(result.errors.full_messages.to_sentence)
+          .to eq(I18n.t("types.edit.form_configuration.invalid_query"))
+      end
+    end
+
+    context "when attribute_groups is malformed JSON" do
+      let(:contract_class) { UpdateFormConfigurationContract }
+
+      it "returns a failure result" do
+        result = service.call(attribute_groups: "{")
+
+        expect(result).to be_failure
+        expect(result.errors[:attribute_groups].to_sentence)
+          .to eq(I18n.t("types.edit.form_configuration.invalid_attribute_groups"))
+      end
     end
 
     context "when adding the type to a project" do
diff --git a/spec/support/components/admin/type_configuration_form.rb b/spec/support/components/admin/type_configuration_form.rb
index 229adf2c292..56fb2e1a7ed 100644
--- a/spec/support/components/admin/type_configuration_form.rb
+++ b/spec/support/components/admin/type_configuration_form.rb
@@ -34,197 +34,207 @@ module Components
       include Capybara::DSL
       include Capybara::RSpecMatchers
       include RSpec::Matchers
+      include Rails.application.routes.url_helpers
 
       def add_button_dropdown
-        page.find ".form-configuration--add-group", text: "Group"
-      end
-
-      def add_attribute_group_button
-        page.find "button", text: I18n.t("js.admin.type_form.add_group")
-      end
-
-      def add_table_button
-        page.find "button", text: I18n.t("js.admin.type_form.add_table")
+        page.find(:test_id, "type-form-configuration-add-button", text: /\A#{Regexp.escape(I18n.t(:button_add))}\z/)
       end
 
       def reset_button
-        page.find ".form-configuration--reset"
+        page.find_test_selector("type-form-configuration-reset-button")
       end
 
       def inactive_group
-        page.find_by_id "type-form-conf-inactive-group"
+        page.find_test_selector("type-form-configuration-inactive-container")
       end
 
       def inactive_drop
-        page.find "#type-form-conf-inactive-group .attributes"
+        inactive_group.find("[data-test-selector='type-form-configuration-inactive-list']")
       end
 
       def expect_empty
-        expect(page).to have_no_css("#draggable-groups .group-head")
+        expect(page).to have_no_css("[data-group-key]")
       end
 
       def find_group(name)
-        head = page.find(".group-head", text: name.upcase)
-
-        # Return the parent of the group-head
-        head.find(:xpath, "..")
-      end
-
-      def checkbox_selector(attribute)
-        ".type-form-conf-attribute[data-key='#{attribute}'] .attribute-visibility input"
+        page.find(:xpath, group_xpath(name))
       end
 
       def attribute_selector(attribute)
-        ".type-form-conf-attribute[data-key='#{attribute}']"
+        %[li[data-attr-key="#{attribute}"]]
       end
 
       def find_group_handle(label)
-        find_group(label).find(".group-handle")
+        group_key = find_group(label)["data-group-key"]
+        page.find_test_selector("type-form-configuration-group-handle-#{group_key}", visible: :all)
       end
 
       def find_attribute_handle(attribute)
-        page.find("#{attribute_selector(attribute)} .attribute-handle")
+        page.find_test_selector("type-form-configuration-attribute-handle-#{attribute}", visible: :all)
       end
 
       def expect_attribute(key:, translation: nil)
         attribute = page.find(attribute_selector(key))
-
-        unless translation.nil?
-          expect(attribute).to have_css(".attribute-name", text: translation)
-        end
+        expect(attribute).to have_text(translation) if translation
       end
 
       def move_to(attribute, group_label)
-        handle = find_attribute_handle(attribute)
-        group = find_group(group_label)
-        drag_and_drop(handle, group)
+        drag_and_drop(find_attribute_handle(attribute), find_group(group_label))
         expect_group(group_label, group_label, key: attribute)
       end
 
       def remove_attribute(attribute)
-        attribute = page.find(attribute_selector(attribute))
-        attribute.find(".delete-attribute").click
+        row = page.find(attribute_selector(attribute))
+
+        within row do
+          page.find_test_selector("type-form-configuration-attribute-actions-#{attribute}").click
+        end
+
+        page.find_test_selector("type-form-configuration-delete-attribute-#{attribute}", visible: :all).click
+
+        page.within_test_selector("type-form-configuration-groups-container") do
+          expect(page).to have_no_css(attribute_selector(attribute))
+        end
       end
 
-      def drag_and_drop(handle, group)
-        target = group.find(".attributes")
+      def drag_and_drop(handle, target)
+        target_container = drop_container_for(target)
+        source_row = handle.find(:xpath, "./ancestor::li[1]")
 
-        scroll_to_element(group)
-        page
-          .driver
-          .browser
-          .action
-          .move_to(handle.native)
-          .click_and_hold(handle.native)
-          .perform
+        scroll_to_element(target_container)
+        source_row.hover
 
-        scroll_to_element(group)
-        page
-          .driver
-          .browser
-          .action
-          .move_to(target.native)
-          .release
-          .perform
+        page.driver.browser.action
+            .move_to(handle.native)
+            .click_and_hold(handle.native)
+            .perform
+
+        scroll_to_element(target_container)
+
+        target_container.all(":scope > li", visible: true).each do |item|
+          page.driver.browser.action
+              .move_to(item.native)
+              .perform
+        end
+
+        page.driver.browser.action
+            .move_to(target_container.native)
+            .release
+            .perform
       end
 
       def add_query_group(name, relation_filter, expect: true)
         SeleniumHubWaiter.wait unless using_cuprite?
 
         add_button_dropdown.click
-        add_table_button.click
+        click_on I18n.t("types.edit.form_configuration.add_query_group")
 
         modal = ::Components::WorkPackages::TableConfigurationModal.new
+        expect(page).to have_css(".wp-table--configuration-modal", wait: 10)
 
-        within ".relation-filter-selector" do
-          select I18n.t("js.relation_labels.#{relation_filter}")
+        unless relation_filter.to_sym == :children
+          within ".relation-filter-selector" do
+            option_label = displayed_relation_filter_label(relation_filter)
+            expect(page).to have_css(".relation-filter-selector option", text: option_label, wait: 10)
 
-          # While we are here, let's check that all relation filters are present.
-          option_labels = %w[
-            children
-            precedes
-            follows
-            relates
-            duplicates
-            duplicated
-            blocks
-            blocked
-            partof
-            includes
-            requires
-            required
-          ].map { |filter_name| I18n.t("js.relation_labels.#{filter_name}") }
+            relation_select = page.find_test_selector("wp-table-configuration-relation-filter", visible: :all)
+            relation_select.find(:option, option_label, wait: 10).select_option
 
-          option_labels.each do |label|
-            expect(page).to have_text(label)
+            option_labels = %w[
+              children
+              precedes
+              follows
+              relates
+              duplicates
+              duplicated
+              blocks
+              blocked
+              partof
+              includes
+              requires
+              required
+            ].map { |filter_name| I18n.t("js.relation_labels.#{filter_name}") }
+
+            option_labels.each do |label|
+              expect(page).to have_text(label)
+            end
           end
         end
-        yield modal if block_given?
-        modal.save
 
-        input = find(".group-edit-in-place--input")
-        input.set(name)
+        yield modal if block_given?
+        modal.save if modal.open?
+
+        fill_group_name(name)
+        save_group
 
         expect_group(name, name) if expect
       end
 
       def edit_query_group(name)
-        if using_cuprite?
-          wait_for_reload
-        else
-          SeleniumHubWaiter.wait
-        end
+        wait_for_turbo
+
+        group_key = find_group(name)["data-group-key"]
+        menu_id = open_query_menu(name)
+        page.find("##{menu_id}", visible: :all)
+            .find(:test_id, "type-form-configuration-edit-query-#{group_key}", visible: :all)
+            .click
+        expect(page).to have_css(".wp-table--configuration-modal")
+      end
+
+      def edit_query_group_via_link(name)
+        wait_for_turbo
 
         group = find_group(name)
-        group.find(".type-form-query-group--edit-button").click
-        # Wait for the modal to appear.
+        label = I18n.t("types.edit.form_configuration.query_group_label")
+        group.click_button(label)
         expect(page).to have_css(".wp-table--configuration-modal")
       end
 
       def add_attribute_group(name, expect: true)
         add_button_dropdown.click
-        add_attribute_group_button.click
+        click_on I18n.t("types.edit.form_configuration.add_attribute_group")
 
-        input = find(".group-edit-in-place--input")
-        input.set(name)
-        input.send_keys(:return)
+        fill_group_name(name)
+        save_group
 
         expect_group(name, name) if expect
       end
 
       def save_changes
-        # Save configuration
-        # click_button doesn't seem to work when the button is out of view!?
-        scroll_to_and_click find(".form-configuration--save")
+        wait_for_turbo
       end
 
       def rename_group(from, to)
-        find(".group-edit-handler", text: from.upcase).click
+        group_key = find_group(from)["data-group-key"]
+        open_group_menu(from)
+        page.find_test_selector("type-form-configuration-group-rename-#{group_key}", visible: :all).click
 
-        input = find(".group-edit-in-place--input")
-        input.click
-        input.set(to)
-        input.send_keys(:return)
+        fill_group_name(to)
+        save_group
 
-        expect(page).to have_css(".group-edit-handler", text: to.upcase)
+        expect_group(to, to)
       end
 
       def remove_group(name)
-        container = find(".group-head", text: name.upcase)
+        accept_confirm I18n.t("types.edit.form_configuration.confirm_delete_group") do
+          menu_id = open_group_menu(name)
+          within "##{menu_id}" do
+            click_link I18n.t("button_delete")
+          end
+        end
 
-        container.find(".delete-group").click
-
-        expect(page).to have_no_css(".group-head", text: name.upcase)
+        expect(page).to have_no_css("[data-group-key]", text: /\b#{Regexp.escape(name)}\b/)
       end
 
       def expect_no_attribute(attribute, group)
-        expect(find_group(group)).to have_no_selector(attribute_selector(attribute).to_s)
+        expect(find_group(group)).to have_no_css(attribute_selector(attribute))
       end
 
       def expect_group(_label, translation, *attributes)
-        expect(find_group(translation)).to have_css(".group-edit-handler", text: translation.upcase)
+        group = find_group(translation)
+        expect(group).to have_text(translation)
 
-        within find_group(translation) do
+        within group do
           attributes.each do |attribute|
             expect_attribute(**attribute)
           end
@@ -232,7 +242,135 @@ module Components
       end
 
       def expect_inactive(attribute)
-        expect(inactive_drop).to have_css(".type-form-conf-attribute[data-key='#{attribute}']")
+        expect(inactive_drop).to have_css(attribute_selector(attribute))
+      end
+
+      def group_order
+        page.within_test_selector("type-form-configuration-groups-container") do
+          all(":scope > [data-group-key] .Box-header span.text-bold", visible: true).map(&:text)
+        end
+      end
+
+      def attribute_order(group_name)
+        find_group(group_name).find("ul").all(":scope > li[data-attr-key]", visible: true).pluck("data-attr-key")
+      end
+
+      def open_attribute_menu(attribute)
+        open_menu("type-form-configuration-attribute-actions-#{attribute}")
+      end
+
+      def open_query_menu(name)
+        group_key = find_group(name)["data-group-key"]
+        open_menu("type-form-configuration-query-actions-#{group_key}")
+      end
+
+      def invoke_group_action(name, label)
+        click_menu_action(-> { open_group_menu(name) }, label)
+        wait_for_turbo
+      end
+
+      def invoke_attribute_action(attribute, label)
+        click_menu_action(-> { open_attribute_menu(attribute) }, label)
+        wait_for_turbo
+      end
+
+      private
+
+      def drop_container_for(target)
+        inactive_list_selector = "[data-test-selector='type-form-configuration-inactive-list']"
+
+        if target.has_css?(inactive_list_selector, wait: 0)
+          target.find(inactive_list_selector)
+        else
+          target.find(".Box ul")
+        end
+      end
+
+      def displayed_relation_filter_label(relation_filter)
+        I18n.t("js.relation_labels.#{relation_filter}")
+      end
+
+      def fill_group_name(name)
+        input = page.find_test_selector("type-form-configuration-group-name-input", wait: 10)
+        input.set(name)
+      end
+
+      def open_group_menu(name)
+        menu_id = nil
+
+        3.times do
+          menu_button = menu_button_for(name)
+          menu_id = menu_button[:"aria-controls"]
+          menu_button.click
+
+          return menu_id if page.has_css?("##{menu_id}", visible: :all, wait: 2)
+        rescue Selenium::WebDriver::Error::StaleElementReferenceError, Capybara::ElementNotFound
+          next
+        end
+
+        raise Capybara::ElementNotFound, "Unable to open menu #{menu_id.inspect}"
+      end
+
+      def menu_button_for(name)
+        group_key = find_group(name)["data-group-key"]
+        page.find_test_selector("type-form-configuration-group-actions-#{group_key}")
+      end
+
+      def open_menu(button_selector)
+        menu_id = nil
+        menu_button = nil
+
+        3.times do
+          menu_button = page.find_test_selector(button_selector)
+          menu_id = menu_button[:"aria-controls"]
+          menu_button.click
+          return menu_id if page.has_css?("##{menu_id}", visible: :all, wait: 2)
+        rescue Capybara::Cuprite::MouseEventFailed
+          menu_button&.trigger("click")
+          return menu_id if page.has_css?("##{menu_id}", visible: :all, wait: 2)
+        rescue Selenium::WebDriver::Error::StaleElementReferenceError, Capybara::ElementNotFound
+          next
+        end
+
+        raise Capybara::ElementNotFound, "Unable to open menu #{menu_id.inspect}"
+      end
+
+      def click_menu_action(open_menu_callback, label)
+        retry_block(args: { tries: 3 }) do
+          menu_id = open_menu_callback.call
+          menu = page.find("##{menu_id}", visible: :all)
+          menu.first("[role='menuitem']", text: /\A#{Regexp.escape(label)}\z/, visible: :all).click
+        end
+      end
+
+      def save_group
+        page.find_test_selector("type-form-configuration-group-save", wait: 10).click
+        expect(page).to have_no_selector(page.test_selector("type-form-configuration-group-name-input"))
+      end
+
+      def wait_for_turbo
+        if using_cuprite?
+          wait_for_reload
+        else
+          SeleniumHubWaiter.wait
+        end
+      end
+
+      def group_xpath(name)
+        <<~XPATH.squish
+          //*[@data-group-key]
+            [.//span[contains(concat(' ', normalize-space(@class), ' '), ' text-bold ')
+            and normalize-space()=#{xpath_literal(name)}]]
+        XPATH
+      end
+
+      def xpath_literal(value)
+        if value.include?("'")
+          parts = value.split("'").map { |part| "'#{part}'" }
+          %(concat(#{parts.join(%q{, "'", })}))
+        else
+          "'#{value}'"
+        end
       end
     end
   end
diff --git a/spec/support/components/work_packages/table_configuration_modal.rb b/spec/support/components/work_packages/table_configuration_modal.rb
index 941d869d151..9813c0b74b7 100644
--- a/spec/support/components/work_packages/table_configuration_modal.rb
+++ b/spec/support/components/work_packages/table_configuration_modal.rb
@@ -81,6 +81,13 @@ module Components
 
       def save
         find('[data-test-selector="spot-modal-wp-table-configuration-save-button"]').click
+        expect_closed
+
+        if using_cuprite?
+          wait_for_reload
+        else
+          SeleniumHubWaiter.wait
+        end
       end
 
       def cancel
diff --git a/spec/support/pages/admin/users/index.rb b/spec/support/pages/admin/users/index.rb
index b446bf3a717..d632d7b004b 100644
--- a/spec/support/pages/admin/users/index.rb
+++ b/spec/support/pages/admin/users/index.rb
@@ -39,8 +39,12 @@ module Pages
         end
 
         def expect_listed(*users)
-          rows = page.all "td.username a", count: users.count
-          expect(rows.map(&:text)).to include(*users.map(&:login))
+          # Wait for each expected user to appear (have_css auto-waits, page.all does not),
+          # then assert the total row count to catch unexpected extras.
+          users.each do |user|
+            expect(page).to have_css("td.username a", text: user.login)
+          end
+          expect(page).to have_css("td.username a", count: users.count)
         end
 
         def expect_order(*users)
@@ -62,25 +66,48 @@ module Pages
         end
 
         def filter_by_status(value)
-          select value, from: "Status:"
-          click_button "Apply"
+          open_filter_panel
+          unless page.has_css?("li.advanced-filters--filter[data-filter-name='status']:not(.hidden)")
+            select "Status", from: "add_filter_select"
+          end
+          # Status renders a single-select and a hidden multi-select side by side;
+          # both share id="status_value". Scope to the visible single-select to disambiguate.
+          within("li.advanced-filters--filter[data-filter-name='status']:not(.hidden) .single-select") do
+            select value, from: "status_value"
+          end
 
           wait_for_network_idle
         end
 
         def filter_by_name(value)
-          fill_in "Name", with: value
-          click_button "Apply"
+          fill_in "Search", with: value
 
           wait_for_network_idle
         end
 
         def clear_filters
-          click_link "Clear"
+          find_by_id("user-filters-form-clear-button").click
 
           wait_for_network_idle
         end
 
+        def open_filter_panel
+          return if filter_panel_open?
+
+          find("[data-test-selector='filter-component-toggle']").click
+          # Wait for the toggle's Stimulus action to actually expand the panel —
+          # otherwise subsequent selectors run against still-collapsed (hidden) UI.
+          expect(page).to have_css(".op-filters-form.-expanded")
+        end
+
+        def filter_panel_open?
+          page.has_css?(".op-filters-form.-expanded", wait: 0)
+        end
+
+        def within_filter(name, &)
+          within("[data-filter-name='#{name}']", &)
+        end
+
         def order_by(key)
           within "thead" do
             click_link key
diff --git a/spec/support/pages/work_packages/embedded_work_packages_table.rb b/spec/support/pages/work_packages/embedded_work_packages_table.rb
index 344763dd7a4..dc29b84abfd 100644
--- a/spec/support/pages/work_packages/embedded_work_packages_table.rb
+++ b/spec/support/pages/work_packages/embedded_work_packages_table.rb
@@ -44,7 +44,7 @@ module Pages
     end
 
     def table_container
-      container.find(".work-package-table")
+      container.first(".work-package-table", wait: 10)
     end
 
     def click_reference_inline_create
diff --git a/spec/support/request_with_header.rb b/spec/support/request_with_header.rb
index 578ade856ec..19973effe70 100644
--- a/spec/support/request_with_header.rb
+++ b/spec/support/request_with_header.rb
@@ -1,14 +1,34 @@
 # frozen_string_literal: true
 
-RSpec.configure do |c|
-  ##
-  # Session-based API authentication requires the X-requested-with header to be present.
-  c.before(:each, type: :request) do |ex|
-    unless ex.metadata[:skip_xhr_header]
-      header("X-Requested-With", "XMLHttpRequest")
-    end
-  end
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
 
+RSpec.configure do |c|
   c.before(:each, content_type: :json, type: :request) do |_ex|
     header("Content-Type", "application/json")
   end
diff --git a/spec/views/users/index.html.erb_spec.rb b/spec/views/users/index.html.erb_spec.rb
index ff8d74da9b5..b10886832cc 100644
--- a/spec/views/users/index.html.erb_spec.rb
+++ b/spec/views/users/index.html.erb_spec.rb
@@ -39,9 +39,7 @@ RSpec.describe "users/index" do
   before do
     User.system # create system user which is active but should not count towards limit
 
-    assign(:users, User.where(id: [admin.id, user.id]))
-    assign(:status, "all")
-    assign(:groups, Group.visible)
+    assign(:query, UserQueries::Static.query(nil))
 
     without_partial_double_verification do
       allow(view).to receive_messages(current_user: admin, controller_name: "users", action_name: "index")
@@ -50,13 +48,6 @@ RSpec.describe "users/index" do
 
   subject { rendered.squish }
 
-  it "renders the user table" do
-    render
-
-    expect(subject).to have_text("#{admin.firstname}   #{admin.lastname}")
-    expect(subject).to have_text("Scarlet   Scallywag")
-  end
-
   context "with an Enterprise token" do
     before do
       create_enterprise_token("token_5_users", restrictions: { active_user_count: 5 })